hh
Merge branch 'master' of https://github.com/LaurentZuijdwijk-AKQA/hackaton

Conflicts:
	app/css/app.css
	app/partials/excursion.html