Updated Router.h slightly
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project
Updated Router.h and Router.cpp for handlePacket function.

Conflicts:
	Routing/Router.h
Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project
fixed merge conflicts with Node.h, Packet.h, and Router.h, awaiting further chnages from Louis

Conflicts:
	Node/Node.h
	Packet/Packet.h
	Routing/Router.h
minor update to Router.h
merp more minor updates
Trying to get code onto github...
Updating to github. Merge branch 'master' of https://github.com/obryanlouis/cs_143_group_project

Conflicts:
	Packet/Packet.h