gameing
Merge branch 'master' of github.com:mcfedr/hangout-risk

Conflicts:
	site/js/game.js
Merge branch 'master' of github.com:mcfedr/hangout-risk
fix bugs
Merge branch 'master' of github.com:mcfedr/hangout-risk
fix
Merge branch 'master' of github.com:mcfedr/hangout-risk