minor
Merge branch 'gh-pages' of https://github.com/risd-gd/htmloutput into gh-pages

Conflicts:
	.DS_Store