Make models and migrations
Fix models, migrations, and associations
Merge pull request #1 from nickgio/models_and_migrations

Models and migrations