ch4:更改代码块markdown写法
ch6:更改代码块的markdown写法
Merge branch 'master' of https://github.com/coderhaoxin/angularjs-cn

Conflicts:
	Chapter6.markdown