changed model associations
Merge branch 'master' of https://github.com/juliaoh/fruitfulminds