"working on jo"
Merge branch 'master' of https://github.com/paperbakwriter09/RideMix

Conflicts:
	home/views.py
	ridemix/urls.py
Saving Victoria's changes
Merge branch 'master' of https://github.com/paperbakwriter09/RideMix