'charCode' instead of 'keyCode'
Merge branch 'master' into gh-pages

Conflicts:
	canvas.html
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/glenwatson/starry-sky into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages