merged two models together

Called baseline
Merge branch 'master' of https://github.com/eac2192/SheepDog

Conflicts:
	sheepdog/dumb/Player.java