add killing players
new client design
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/client/assets/js/run_game.js