opt modify
Merge branch 'master' of https://github.com/rpaigt/cs6250narada
formatting
Merge branch 'master' of https://github.com/rpaigt/cs6250narada
routing changes from arvinder