GUI

Conflicts:
	src/modelTestSam/GameModel.java