Integrated origin/master
Merge branch 'master' of https://github.com/boerngen-schmidt/commuter-simulation.git