bullshit that does nothing
stuff to lsit
Merge branch 'nathan'
Merge branch 'master' of https://github.com/NJLucyk/InstantMessenger into chris

Conflicts:
	listserv.cpp
final stuff for user