connected paperclip to amazon web services
Merge branch 'master' of https://github.com/Jrmcneil/pix