Still working out synchronization errors
Amazing
Merge branch 'dev' of ssh://git@github.com/CSc436/Project-4x.git into
dev

Conflicts:
	src/com/client/model/ClientController.java
	src/com/client/rendering/RenderTile.java
	src/com/server/SimpleSimulatorImpl.java
	src/com/shared/model/commands/ConstructBuildingCommand.java
	src/com/shared/model/control/GameModel.java
Merge branch 'dev' of ssh://git@github.com/CSc436/Project-4x.git into dev