conflict
Merge branch 'master' of https://github.com/Schnitzel/icompetence_class2

Conflicts:
	index.html