Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
..
css 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
img 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
lib 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
templates 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