Added yeoman link
Fixed merge