ringing
Merge branch 'master' of https://github.com/edwardsamuel/Gunbond

Conflicts:
	Sister-2/Gunbond-Client/Gunbond-Client/Message.cs