past trips but no future trips
Merge branch 'past-trips'

Conflicts:
	app/views/trips/index.html.erb