stuff
Merge branch 'master' of github.com:isacarnekvist/trafficsim
Merge branch 'master' of github.com:isacarnekvist/trafficsim
Merge branch 'master' of github.com:isacarnekvist/trafficsim
Progress