change templates 模板
change templates 模板
Merge branch 'master' of github.com:jingyanjiaoliu/angular-guide-zh
add link for chapter 6
Merge remote-tracking branch 'origin/master'