don't remember due to server's being crap
fixed merge
Merge branch 'master' of github.com:chueyee2007/network

Conflicts:
	client/client.cpp
	kdc/KDC.cpp