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