Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of https://github.com/gsnorton/CS-547-Project-Two.git into develop
Resolve issue32. Add a HashMap of workers on server side so updates on
local position of workers won't affect server side. Add translation from
local coordinates to global coordinates for worker position and movement
destination. Notice game freezes sometimes.
Modify issues.mkd
Merge branch 'issue32' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	atlantis/issues.mkd
	atlantis/src/atlantis/GameStatus.java
	atlantis/src/atlantis/Overlay.java
Fix conflicts between issue32 and remote develop.