test
Merge branch 'master' of https://github.com/haydar9/RPI-Game.git

Conflicts:
	Trial
Project/ClientSide/src/ca/carleton/sysc4001/project/trial/java/client/Client.java