bla

bla
Merge branch 'master' of https://github.com/Avans-Everyware-42IN11EWe/Everyware-HTML-5-app

Conflicts:
	GlasAanHuis/assets/webapp/start.html