Committing before a pull.
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Node/Host.cpp
	Routing/Router.cpp