Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 lat temu
..
css 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 lat temu
img 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 lat temu
js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 lat temu
lib 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 lat temu
templates 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 lat temu
index.html 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 lat temu