Merge branch 'master' of https://github.com/Snugglepantz/angular-basics