erax
Merge branch 'master' of https://github.com/crdunwel/cs132_final

Conflicts:
	socketEvents.js
	static/js/mobile_frontend.js
	templates/clientPage/clientPage-body.html