Real-time chat functionality
Merge branch 'master' of github.com:klgilbert/mentorplus into testchanges

Conflicts:
	server.js