1st commit
Merge branch 'master' of github.com:yinai/master