getting really close now
Merge branch 'master' of https://github.com/unbibium/scud

Conflicts:
	src/test/java/scud/player/PlayerFactoryTest.java