checkpoint
Merge branch 'master' of github.com:MorleyB/yeoman_chrome_extension
merging