messed with input, and sit errors, put input in new method. probably other things
fixed some merge issues
Merge branch 'master' of github.com:chueyee2007/network

Conflicts:
	client/client.cpp
	responder/Responder.cpp