Worked on the friends page mechanism
Merge branch 'master' of https://github.com/paperbakwriter09/RideMix

Conflicts:
	ridemix/static/js/main.js