Load of stuffffff
Loads of stuff
Merge branch 'master' into temp

Conflicts:
	src/edu/csf/client/Controller.java
	src/edu/csf/client/GameGUI.java