improve the 1-1 strategy by 10%, and fix some bugs in manySheepStrategy (also use the 1-1 strategy to cover it up at the end)
Merge branch 'master' of https://github.com/aeonlin/sheepdog

Conflicts:
	sheepdog/g7/Player.java