Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable
Updating Git Ignore
removing unneeded response
Updates to make server more stable and better handle disconnections
Merge remote-tracking branch 'origin/stable'

Conflicts:
	.gitignore
	server.js