Update issue.mkd
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	atlantis/issues.mkd
	atlantis/src/atlantis/PlayingState.java
Add hot key in overlay.
Revert "Add hot key in overlay."

This reverts commit 43c3811eacf4e70d43800382b9fac7871dd3cf28.
Add some hot keys. ('Escape' for deselect commands, 'a' for attack, 'm'
for move)
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	atlantis/issues.mkd
Merge branch 'develop' of https://github.com/gsnorton/CS-547-Project-Two
into develop

Conflicts:
	atlantis/issues.mkd
Merge branch 'develop' of
https://github.com/gsnorton/CS-547-Project-Two.git into develop

Conflicts:
	atlantis/issues.mkd
Fix conflict in issue.mkd
Merge branch 'develop' of https://github.com/gsnorton/CS-547-Project-Two.git into develop
Update issue.mkd
Add hot key in overlay.
Revert "Add hot key in overlay."

This reverts commit 43c3811eacf4e70d43800382b9fac7871dd3cf28.
Fix conflict in issue.mkd
Resolved issue18. At this time both windows can reflect the server
status. Fixed the worker fly out of window problem by limiting 'delta'
to a small value and set a small velocity for worker. (Maybe need to
revisit this to find a better solution)
Add a field for specifying number of players. Default value is 1.
Merge branch 'issue18' into develop

Conflicts:
	atlantis/issues.mkd
	atlantis/src/atlantis/PlayingState.java
Merge branch 'develop' of
https://github.com/gsnorton/CS-547-Project-Two.git into develop

Conflicts:
	atlantis/src/atlantis/Worker.java