models and stuff
Merge pull request #1 from robyntrovati/master

models and stuff