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

Conflicts:
	routers.txt
Basic Vegas code.