Generated the models
Merge branch 'master' of github.com:r23712/pr-civic-hackathon

Merged with Ryan