beginings of results merging
Merge branch 'master' of https://github.com/paperbakwriter09/RideMix

Conflicts:
	ridemix/static/js/ridemix_map.js
Merge branch 'master' of https://github.com/paperbakwriter09/RideMix

Conflicts:
	ridemix/static/js/ridemix_map.js