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

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