removed remnants of paperclip, byeeeeeeeee
Merge pull request #89 from domestic/remove_paperclip

removed remnants of paperclip, byeeeeeeeee
fixed merge conflicts for photo upload