commit summary
Merge branch 'gh-pages' of https://github.com/panfu/1982.im into gh-pages

Conflicts:
	index.html