working server
Merge branch 'master' of https://github.com/achadha235/pong

Conflicts:
	client/index.html