updated from macbook
Merge branch 'chapter3' of https://github.com/jonniespratley/angular-cms into chapter3