Merge fix 1
Merge branch 'master' of github.com:madisonmay13/coplay

Conflicts:
	app.js