Simulation switched order of CLAs
Merge branch 'master' of github.com:menewman/cityEscape