fixed models and associations
migrations, models, associations fixed?
Merge pull request #4 from bamiano/master

fixed models and associations