changed gemfile
updated relationship controller and relationship and user models
Merge branch 'master' into Matt