stops view controllers changed to stops

making routes view controller now
Merge remote-tracking branch 'origin/master'