Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/game/GameSystem.class

Revert "do it"

This reverts commit
469a0b977beb27f03ca4228017b7a290b23ce9dc.

Conflicts:
	bin/game/MakePlayers.class
	src/game/MakePlayers.java

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	bin/game/Player.class

do it