fixed model associations
Merge branch 'master' of https://github.com/Ryan5231/hood into ryan_model