proxying messages
Merge branch 'messages'

Conflicts:
	server.js