game
Merge branch 'master' of http://github.com/czxcjx/penguingame

Conflicts:
	static/game.js