devilll
Merge branch 'master' of https://github.com/hongz1125/dGame.com

Conflicts:
	index.html
	static/js/Body.js
	static/js/Draw.js