linking socket routes to method calls
Merge branch 'master' of github.com:awbraunstein/partyplayer

Conflicts:
	app/models.js
	src/models.coffee
Merge branch 'master' of github.com:awbraunstein/partyplayer

Conflicts:
	app/app.js
	app/controllers/party.js
	app/controllers/static.js
	app/models.js
	app/router.js
	app/utils.js
	src/models.coffee