eindtoets
Merge branch 'master' of https://github.com/JeroonBosch/FED2

Conflicts:
	Deeltoets1/static/css/style.css
	Deeltoets1/static/js/app.js
	WebApp/index.html
	WebApp/static/css/style.css
	WebApp/static/js/app.js
	WebApp/static/js/vendors/hammer.min.js
	WebApp/static/js/vendors/routie.js
	WebApp/static/js/vendors/transparency.js
	WebApp/static/js/vendors/xhr.js