try to merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	NineMensMorris/src/myClasses/GameGUI.java