fix typos
resolve conflicts
Merge branch 'clean' of https://github.com/Thinkful/guide-intro-to-angular into clean