add
:wq
Merge branch 'master' of github.com:karenpeng/nodegame

Conflicts:
	app3.js
	assert/js/canvas.js