added paperclip and awe-sdk
paperclip is working locally
nothing
Merge branch 'paperclip'
Merge branch 'master' of github.com:maxprogram/prototypr
s3 config
fixed conflict
Merge branch 'master' of github.com:maxprogram/prototypr