Adding dependencies
Merge branch 'master' of github.com:simonlast/popcorn-music

Conflicts:
	.meteor/packages
	smart.json
	smart.lock
Merge branch 'master' of github.com:simonlast/popcorn-music
Getting rooms working
Merge branch 'master' of github.com:simonlast/popcorn-music

Conflicts:
	client/client.js
	popcorn-music.html