posting new activities is now functional
Merge remote-tracking branch 'origin' into user-activity
final touches to the new activity (route, model, show)
Merge branch 'master' into user-activity
fix email
updates to the activities show page
Merge pull request #17 from RJFryman/user-activity

Updates to Activities Show Page
Merge branch 'master' into usershow
updated user show, fixed facebook issues with activity creation