git commit  yeoman
git commit  yeoman
Merge remote-tracking branch 'origin/master'