Commmitting before pulling.
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Control/Control.cpp
	Flow/Flow.cpp
	Main/Main.cpp
	Output/FlowRTT.txt
	Output/FlowReceive.txt
	Output/FlowSend.txt
	Output/HostReceive.txt
	Output/HostSend.txt
	Output/LinkFlowRate.txt
	Output/LinkOccupancy.txt
	Output/LinkPacketLoss.txt
	Routing/Router.cpp
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Flow/Flow.cpp
Added the input file.