.
Merge branch 'master' of https://github.com/Th0ar/xv6-chinese

Conflicts:
	content/chapter6.markdown
so many!