../.gitignore
Merge branch 'master' of https://github.com/jingyanjiaoliu/angular-guide-zh