MYHANDARETYPINGWORDSSS!!!!
Solved merge conflict
Merge branch 'temp'

Conflicts:
	src/edu/csf/client/Controller.java
	src/edu/csf/server/model/GameModel.java