added initial food in storage for towns
more testcase numbers in output
optional lat/lng in input csv
Merge branch 'master' of https://github.com/paivola/mapserver
Added note (use unix or windows' git) to README.md
Merge branch 'master' of github.com:paivola/mapserver
Merge branch 'master' of https://github.com/paivola/mapserver
added setLengthToDistance to road, sets length to distance between endpoints; increased road's maxConnections to make it get connectable to rivers
Merge branch 'master' of https://github.com/kokosp/mapserver

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java