added ready button to victory/defeat screens
Merge branch 'master' into reset-button
fixed clients entries overwriting each other bug
Merge branch 'master' into reset-button

Conflicts:
	client.html
added option to choose runner or observer for next round
fix bug
Merge branch 'master' into reset-button

Conflicts:
	client/trap.js