Merge commit
Merge branch 'master' of https://github.com/2She2/RideWithUs.git
Merge branch 'master' of https://github.com/2She2/RideWithUs.git