complete migrations and models
working models and migrations
fix merge conflicts
Merge pull request #9 from sharmilajesupaul/chris-ronald

Chris ronald