fixed merge conflicts
fixed more conflicts
added ability to set profile picture on sign up
added method for pictures from url
profile picture can now be pulled from facebook
pointless picture removed
clean up
Merge branch 'master' of github.com:paulcox24/whatsgood into derek/facebook_photo
Merge pull request #77 from derekdapp/derek/facebook_photo

Derek/facebook photo