updates
Merge branch 'master' of https://github.com/mjhea0/thinkful-angular