Search is working
Merge branch 'master' of github.com:simonlast/popcorn-music

Conflicts:
	client/client.js
Add npm as a dependency