tried fix
Merge branch 'master' of https://github.com/dbhaug/assignments.git

Conflicts:
	CS325/src/assignments/frs/hotgammon/common/GameImpl.java