facebook login
Merge branch 'master' of https://github.com/hamidkhanzai/Carpool

Conflicts:
	app/views/layouts/application.html.erb
Facebook Login and Google Map