改字
Merge branch 'master' of https://github.com/evenwu/oppose

Conflicts:
	js/game.js
Merge branch 'master' of https://github.com/evenwu/oppose

Conflicts:
	js/game.js