Added paperclip
Merge branch 'strong-params'