Merge branch 'gh-pages' of https://github.com/kuahn/kuahn.github.com

Conflicts:
	index.html
	javascripts/scale.fix.js
	params.json
	stylesheets/styles.css