added picture to pictures
s3 storage works
removed heroku-linked stuff
no more conflicts
Merge branch 'working_on_amazon_integration'