Add files via upload#5

Joesivan wants to merge 2 commits intomainJoesivan/test1:mainfrom

Joel/new-s3-settingsJoesivan/test1:Joel/new-s3-settingsCopy head branch name to clipboard