Finished storage type.  Use "ant our-server -Dstorage=file" to run as file anything else will run as the database.
no message
Merge branch 'master' of https://github.com/reedcwilson/catan

Conflicts:
	catan.sqlite