working on user show
Merge branch 'master' into usershow
fix robot wiz
updated user show, fixed facebook issues with activity creation
Merge pull request #18 from RJFryman/usershow

Usershow
added facebook user pics
uploading new files for activity show page
Merge branch 'master' of https://github.com/RJFryman/nodemon
all tests passing, updated activities show
final touches to user show and activity show pages
fixed merge conflict
Merge pull request #20 from RJFryman/user-activity

User activity - fixed merge conflicts
merge fix