branch 'master' of https://github.com/fselhorst/spaarnwoudeAngular

Conflicts:
	app/index.html
	app/scripts/controllers/main.js
Merge branch 'master' of https://github.com/fselhorst/spaarnwoudeAngular

Conflicts:
	app/index.html
	app/scripts/controllers/main.js