I don't know what this commit does, but the changes were there.
Merge branch 'master' of github.com:gavinhoward/byu-cs340-sixmix

Conflicts:
	SettlersOfCatan/.classpath
	SettlersOfCatan/src/client/GamePlayState.java
	SettlersOfCatan/src/client/IMasterController.java
	SettlersOfCatan/src/shared/state/game/GameSetupController.java
	SettlersOfCatan/src/shared/state/game/LoginModelController.java