error fixing
Merge https://github.com/amphi-/uni-homework

Conflicts:
	css/style.css
	index.html