comments out portions of controller
git push
Merge branch 'master' into relationships
Merge pull request #4 from theoblivious/relationships

Relationships