Merged RideViewController into RideController.
Merge branch 'SpringProject' of github.com:destroyerdust/SWEN-343-Group6-CoolName into SpringProject