Merge branch 'gh-pages'
put box sizing back
Merge branch 'master' into gh-pages