merged
Merge branch 'master' of github.com:iriswang/mdfs
upload?