first add
Merge branch 'master' of github.com:bumaociyuan/railsDemo