.
Merge branch 'master' of github.com:kswope/javascript_shared

Conflicts:
	webgl/.hello-canvas.js.swp
.