pushing to heroku
added image attachment - paperclip
S3 paperclip troubleshooting
pictures pulled from s3 now display
partners paperclip working
prepare for merge
trying to remerge
reremergey
Merge branch 'master' into mailer
super remergemerge