Don't worry, the title will change...
Merge branch 'master' of https://github.com/weshack/rideshare

Conflicts:
	rideshare/templates/index.html