Last fixes
Merge branch 'master' of https://github.com/FridayMarch26th/hs2urbanplanning

Conflicts:
	app/partials/question1.html