For JSMag March 2013 article.
Merge branch 'master' of github.com:mschwartz/GameEngine

Conflicts:
	.idea/workspace.xml