sync
Merge remote-tracking branch 'origin/Testing' into Testing

Conflicts:
	bin/spel/Game.class
	bin/spel/entities/Player.class
	src/spel/Game.java
sync
sync
Merge branch 'Testing' of https://github.com/Trisslotten/gameEngine into Testing

Conflicts:
	bin/spel/entities/Player.class
seriously