edited some stuff
Merge branch 'master' of https://github.com/anromeo/art4life
committing to pull
added paperclip aws files