add changes

# Conflicts:
#	app/Http/Controllers/RideController.php
#	resources/views/track-ride.blade.php
