update_peer endpoint
Merge branch 'master' of github.com:ChatterNets/chatternets

Conflicts:
	server.coffee
	server.js