Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
..
partials 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
scripts 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
bower.json 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
index.html 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren