synched with origin
Upload and grade works like a charm locally. No heroku yet.
deleted ghost files
merged with origin
Added s3 dependency to package.json.