bilder
Merge branch 'gh-pages' of https://github.com/al222jf/Projekt into gh-pages

Conflicts:
	css/style.css
	index.html
	javascript/scripts.js