My Changes
new changes made
Merge branch 'master' of https://github.com/hamidkhanzai/Carpool

Conflicts:
	app/views/search/list.html.erb