Response to joining the game
Merge branch 'master' of https://github.com/CMS611-snap/snap-backend

Conflicts:
	public/js/snap.js
Merge branch 'master' of https://github.com/CMS611-snap/snap-backend