added some socket stuff to app.coffee
Merge branch 'master' of github.com:awbraunstein/partyplayer

Conflicts:
	src/app.coffee
	src/router.coffee