responsive
responsive
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/resources/messages_en.properties
	WebApp/src/main/resources/messages_nl.properties
Merge branch 'master' of https://github.com/robinvz/TeamC
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/resources/messages_en.properties
	WebApp/src/main/resources/messages_nl.properties
	WebApp/src/main/webapp/resources/css/main.css
Merge remote-tracking branch 'origin/master'
nieuwe 404, validatie checks createTrip