Wat css aanpassingen
Merge branch 'master' of https://github.com/watchthemoon/PhpProject

Conflicts:
	assets/css/style.css