PingPong Test for Server Latency Testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/obacht/Menu.js