Changed upload function. Renamed to uploadFile
Merge branch 'master' of https://github.com/Photowall/s3