Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 rokov pred
..
partials 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 rokov pred
scripts 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 rokov pred
bower.json 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