Some changes
added some methods
Merge branch 'master' of https://github.com/rpaigt/cs6250narada

Conflicts:
	opt.py
	routing.py