updates
Merge branch 'master' of https://github.com/Ryan316/my-angular-example