commit x
Merge branch 'master' of https://github.com/fotogarten/Projekt

Conflicts:
	index.html