Another aw3some edit
Merge branch 'master' of github.com:lanxu/fgj2014

Conflicts:
	src/game.js
	src/model/game_model.js
	src/model/line_model.js
	src/view/game_view.js