only little changes in sending messages
Merge branch 'master' of github.com:CaptainChaos/cryptim

Conflicts:
	functions.js
merged functions.js