various
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
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)
Merge branch 'dev'

Conflicts:
	.gitignore
	pom.xml
	src/main/java/com/alasershark/dangerzone/City.java
	src/main/java/com/alasershark/dangerzone/DangerZone.java
	src/main/java/com/alasershark/dangerzone/Player.java
	src/main/java/com/alasershark/dangerzone/PlayerListener.java
	src/main/java/com/alasershark/dangerzone/persistence/CityRepository.java
	src/main/java/com/alasershark/dangerzone/persistence/PlayerRepository.java
fixed merge commits, maybe
go away .orig files! how did you get there in the first place
i knew mergetool was a bad idea