ability to run a test from csv
tweaks, set ticks
comment about running
Merge branch 'master' of https://github.com/paivola/mapserver
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
Merge branch 'master' of https://github.com/paivola/mapserver

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
population -> dump.csv
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
Wrapped and hid debug-output from population. Fixed a bug in mortalities
Fixed FoodShortage formulas
Fixed a discrepancy in variable naming
Set some debug-output-variables to previous values.
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge
Population now uses settings for input-values.
Merge branch 'master' of https://github.com/JuhaniImberg/mapserver-merge
Merge remote-tracking branch 'population/master'

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
	src/main/java/fi/paivola/population/PopulationExtender.java
Merge remote-tracking branch 'merge/master'