change locally
conf file commited
Merge branch 'master' of https://github.com/TorinYu/map-reduce_facility
file uploader change