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