sit errors all stored, checkpointing before finishing up all introductions and solving of errors
commit before merge changes
finished adding conditions for sitErrors (introducing and solving)
Merge branch 'master' of github.com:chueyee2007/network

Conflicts:
	client/client.cpp
	client/makefile