try

Signed-off-by: Sam Troxel <stroxel2323@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	NineMensMorris/src/myClasses/GameInstance.java

Signed-off-by: Sam Troxel <stroxel2323@gmail.com>