Fixed the data_model bug
Merge branch 'master' of github.com:bikecomps/simulation