commit to pull
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	routers.txt
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project
Committing before pulling
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Flow/CongestionAlgorithm.cpp
	Flow/CongestionAlgorithm.h
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	routers.txt
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Flow/CongestionAlgorithm.cpp
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Flow/CongestionAlgorithm.h
minor documentation changes to Flow
committing to pull
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Flow/CongestionAlgorithm.cpp