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