added workspace
fixed merge
Merge branch 'jasmine' of https://github.com/jonniespratley/learning-yeoman-ch4 into jasmine
updated nav menu;