Display is a CSS attribute, not html
Merge branch 'master' of https://github.com/sunian/smash