only partition once
Merge branch 'master' of https://github.com/eac2192/SheepDog

Conflicts:
	sheepdog/g1/Player.java
Merge branch 'master' of https://github.com/eac2192/SheepDog

Conflicts:
	sheepdog/g1/Player.java