Updated.
Merge branch 'master' of github.com:lanxu/fgj2014

Conflicts:
	src/game.js