a
Merge branch 'master' of github.com:weshack/rideshare
Defaults for search.
Merge branch 'master' of github.com:weshack/rideshare

Conflicts:
	db.sqlite3