"Fixes the ride/Show.html.erb"
Merge branch 'master' of https://github.com/imapenguin91/cvtcrideshare

Conflicts:
	db/development.sqlite3