Merge branch 'refactor-client-pong'