test
Merge branch 'master' of https://github.com/kevinvde/reisplanner.git

Conflicts:
	reisplanner/src/main/java/be/rpc/reisplanner/HomeController.java