clean code
Merge branch 'yifei' of https://github.com/yutongp/RaiseMeUp into yifei

Conflicts:
	client/code/app/entry.js
	client/views/game.html
Merge branch 'yifei' of https://github.com/yutongp/RaiseMeUp into ypei