Merge branch 'develop' of https://github.com/gsnorton/CS-547-Project-Two into develop
Test
Basic server and client model
Do some test.
Merge branch 'develop' of https://github.com/gsnorton/CS-547-Project-Two into issue7
Server create a client for its own.
Merge branch 'issue7' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	atlantis/.classpath
	atlantis/src/atlantis/PlayingState.java
Basic server/client networking model. Server passes map name to client.