made changes
Merge branch 'master' of https://github.com/emilymacleod/simple-chat-server

Conflicts:
	index.html
	index.js