YY edit README.md
Merge branch 'master' of github.com:scalableinternetservices/Xup
Resolve the conflict.