test
Some basic math
first
commit
removal of test
Merge remote-tracking branch 'origin/logistics'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'transport/master'

Conflicts:
	src/main/resources/settings.json
function for loss of stuff on road
added pathfinding (no longer than 2 roads to destination)
maybe working methods for sending stuff around
App.java not working halp
App.java now working but roadmodels do not print right
example kinda works
Merge branch 'master' of https://github.com/kokosp/mapserver

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java
	src/main/resources/settings.json