Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 11 años
..
css 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 11 años
img 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 11 años
js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 11 años
lib 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 11 años
templates 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 11 años
index.html 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request hace 11 años