Better collision
Merge branch 'playtest' of https://github.com/KingToadz/Proeven into playtest

Conflicts:
	stomp/src/js/Files.js
	stomp/src/js/game/objects/AnimationHandler.js
	stomp/src/js/game/objects/Player.js
	stomp/src/js/game/popups/PopupSkipTutorial.js