some changes
confilect resolved
Merge branch 'master' of https://github.com/hamidkhanzai/Carpool

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