Merge
Merge branch 'master' of https://github.com/woutsanders/HTML-eindopdracht

Conflicts:
	people/example.html