Indiana Jantje changes
Merge branch 'master' of https://github.com/mschuurmans/avans_p1.4

Conflicts:
	src/nl/avans/essperience/controllers/GameHandler.java