tried adding code but commented it out
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/berkeley/cs162/TCPMessage.java
Merge remote-tracking branch 'origin/master'
updated TPCLog and added tests