Mogelijke oplossing
Merge branch 'master' of https://github.com/drunkrocketeer/Interface-Amersfoort

Conflicts:
	assets/scripts/app.js