first commit
Merge branch 'master' of https://github.com/petemmitchell/paperclip_rails_4.2_demo into create_demo