first commit
Changes for paperclip
changes for pic upload
Merge remote-tracking branch 'upstream/master'