merging...
Merge branch 'master' of https://github.com/thedeann/mytcp

Conflicts:
	MyTCPProject/src/edu/mst/cs/mytcp/MyTCP.java
pulling...
Merge branch 'master' of https://github.com/thedeann/mytcp
cleaned up TODO comments and logging output