Change file upload from amazon to local
Merging branch