no changes? yet forced to commit?
Merge branch 'master' of https://github.com/huey253/prototype

Conflicts:
	html5-canvas-game-character-1.js