增加包含块的确定，宽度和行高。
Merge branch 'master' of https://github.com/sunnylost/sunnylost.github.com

Conflicts:
	draft/css-visual-formatting-model.md