derp
Merge branch 'test' of https://github.com/Znalost/network into test

Conflicts:
	player/Board.class
	player/MachinePlayer.class
	player/MachinePlayer.java