Merge pull request #21 from ianrose/master

Border-box - Inheriting box-sizing styles
Merge branch 'master' into gh-22-editorconfig