Makefile added
Merge pull request #1 from NJLucyk/badbranchname

Badbranchname
Added some documentation.
Merge branch 'chris' of https://github.com/NJLucyk/InstantMessenger into badbranchname
Added to listserv. not working
Merge branch 'master' of https://github.com/NJLucyk/InstantMessenger
Merge branch 'chris'

Conflicts:
	protocol.cpp
	protocol.h
	ringbuffer.h
Merge branch 'chris' of https://github.com/NJLucyk/InstantMessenger into nathan
Merge branch 'chris' of https://github.com/NJLucyk/InstantMessenger into nathan
listserv has stuff from user.cpp now
Merge branch 'chris' of https://github.com/NJLucyk/InstantMessenger into nathan
Merge branch 'master' of https://github.com/NJLucyk/InstantMessenger into chris
We'll see