Merge branch 'master' of https://github.com/NJLucyk/InstantMessenger into chris

Conflicts:
	listserv.cpp
final stuff for user
merged again!