commit changes so I can pull Mikenna's fixes
Merge branch 'master' of github.com:bikecomps/simulation
Merge branch 'master' of github.com:bikecomps/simulation