Merge branch 'gh-pages' of https://github.com/weishai/showcode into gh-pages

Conflicts:
	javascripts/main.js
Merge branch 'gh-pages' of https://github.com/weishai/showcode into gh-pages

Conflicts:
	javascripts/main.js