commit
Merge branch 'master' of https://github.com/project-ITS/project

Conflicts:
	inc/view.php
slider werkend
Merge branch 'master' of https://github.com/project-ITS/project