第六章 作用域小节译完
Merge branch 'master' of https://github.com/basestyle/angularjs-cn

Conflicts:
	Chapter6.markdown