merged opt.py and routing2.py to routin.py; integrated opt.py with routing2.py ; small updates to routing2.py
edit
Merge branch 'master' of github.com:rpaigt/cs6250narada

Conflicts:
	routing2.py
Merge branch 'master' of github.com:rpaigt/cs6250narada