asd
Merge branch 'master' of https://github.com/Niels-P/school

Conflicts:
	index.html

sad