change trip controller
Merge branch 'master' of https://github.com/katepdonahue/Traveling_Salesman
Merge branch 'master' of https://github.com/katepdonahue/Traveling_Salesman