this shit now works
Merge branch 'master' of https://github.com/Cpruce/PartyHopper

Conflicts:
	app.js
this shit should now work