Fix typo
Merge branch 'master' of github.com:Melanie8/ReliableTransferProtocol
Add network and sr
Merge branch 'master' of github.com:Melanie8/ReliableTransferProtocol

Conflicts:
	Makefile
	common.h