memberlist stuff. not much
Merge branch 'chris' of https://github.com/NJLucyk/InstantMessenger into nathan
flags
added more user.cpp stuff
Merge branch 'chris' of https://github.com/NJLucyk/InstantMessenger into nathan

Conflicts:
	protocol.h
Makefile works
Fixed the compiling errors so now we should only type make.
This will make it easier. I haven't tested if this works
Merge branch 'chris' of https://github.com/NJLucyk/InstantMessenger into nathan
Merge branch 'master' of https://github.com/NJLucyk/InstantMessenger into chris
added new user handling