Client update connection established
Merge branch 'Multiplayer' of https://github.com/ProfAmesBC/Game2013.git
into Multiplayer

Conflicts:
	src/game/Player.java