Update README.md
Merge branch 'refs/heads/master' into add_carpool_functionality

Conflicts:
	README.md