Add image upload with Paperclip
Add Amazon S3 for Paperclip uploads to Heroku
Merge commit 'HEAD@{1}'