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

Conflicts:
	app/assets/stylesheets/main.css
merged