working associations tests
Merge branch 'master' into models_migrations
Merge pull request #3 from nairys/models_migrations

association tests passing