styleanpassungen
Merge branch 'master' of https://github.com/phexmedia/eLearning

Conflicts:
	css/styles.css