Updated model relationships
Merge branch 'master' of https://github.com/aarononken/YMCA