wtf
misc
html
html
Merge pull request #28 from icro/master

misc + html