GPS integrated into search
Merge branch 'master' of https://github.com/tjsander/grocery-rideshare

Conflicts:
	index.html