Added lodash dependencies, fixed typo in party controller, merge conflict
Merge branch 'master' of github.com:awbraunstein/partyplayer

Conflicts:
	package.json
	src/app.coffee
	src/controllers/party.coffee