modify map tests
merge conflicts and modify complete tests
add modules to tests
finish query functions for map
add radius test
merge conflicts
commit
proxy and message list
command object
conflicts resolved
merge local branches and fix login and join for tests
Merge pull request #11 from reedcwilson/phase1/feat/catanMap

Phase1/feat/catan map
merge proxy branch
Merge pull request #12 from reedcwilson/proxy

Proxy/Message List
merge Jeremy's branch to master