controller problems
Merge branch 'master' of github.com:simplereach/buddybuddy