Tried clicking, sorted out some stuff
Merge remote-tracking branch 'origin/Testing' into Testing

Conflicts:
	bin/spel/Game.class