ik wil errors
Merge branch 'master' of https://github.com/Roysten/Picto.git

Conflicts:
	src/nl/saxion/act/playground/GameView.java