fixes s3
fixes merge conflict
Merge pull request #60 from JBrianGordon/kellybranch

implements s3