Replace our old model
Add some tests for the new model
Fix bugs
Merge pull request #59 from CMPUT301W13T06/model

Model