comment
Merge branch 'develop' of https://github.com/chrisshroba/sherrand into develop

Conflicts:
	src/templates/ride_info.html