modified:   server/Makefile
	modified:   server/twitServer.cpp
Merge http://github.com/venomouse/os5