update
Merge branch 'master' of https://github.com/guspedroso/MPG

Conflicts:
	client/game.js