fixed merge conflicts
fixed more conflicts
added ability to set profile picture on sign up
added method for pictures from url
Merge pull request #76 from paulcox24/Feed

Feed
Removed venues controller
Removed venues model
removed venue routes and links
profile picture can now be pulled from facebook
pointless picture removed
Down acts migration
Removed acts controller
Removed acts model
Removed acts model
Down event_acts
Removed event_act model
clean up
Merge branch 'master' of github.com:paulcox24/whatsgood into derek/facebook_photo
Removed event_acts
hid events link for now