fixed models to line up with json
merge
Merge pull request #3 from anniedaniel/master

fixed models