Merge pull request #11 from aLaserShark/master

Pull master to dev
Merge pull request #13 from aLaserShark/master

Startup changes merge to dev
various
Merge pull request #14 from jankroken/dev

various changes
not sure if i commited this earlier locationblock
finished off locationblock, added addX() and addY() methods to location
added troop class, few misc changes
httpservlet for a basic ui
simple untested socket client framework
simple socket framework - and a simple main program,
the server should get a stop mechanism, and the main
converted to a unit test
Merge pull request #18 from jankroken/dev

simple socket server
unneeded servlet is unnneeded - removed servlet.java
a little preparation for heroku wee
tech work
misc changes
updated pom and procfile and added full and empty locationblocks (for a rudimentary system on determining where a new town should go)
version number bump to 0.0.2 among other things
work on players and cities
updated gitignore
cleaning up cruft