Merge with master
Merge branch 'master' of https://github.com/paulcox24/whatsgood
Merged and added paperclip migration