file upload and update gulpfile
merging stuffs