compiles correctly now
changed
Merge branch 'temp'

Conflicts:
	player/MachinePlayer.class