Merge branch 'master' of https://github.com/NJLucyk/InstantMessenger into chris
We'll see
Merge branch 'chris' of https://github.com/NJLucyk/InstantMessenger into nathan

Conflicts:
	protocol.h