migrated
Merge branch 'master' of https://github.com/paulcox24/whatsgood
db:migrated from upstream
Merge with master
got paperclip working
adding omniauth and fixing merge conflicts?
migrated and did bundle
Merge pull request #73 from djmrr/mike/paperclipped_engage

Mike/paperclipped engage
Merge branch 'master' of https://github.com/paulcox24/whatsgood
Merged and added paperclip migration
Edit form fixed
fix gitignore
ignore local images
Merge pull request #74 from paulcox24/edit_profile

Edit profile
facebook now gets email
Add public activity gem
public activity migation
Ran migration
User feed for all users
Link to feed for admin