Changed setting for s3
Merge branch 'master' of github.com:RyanCccc/PeeTwitt