starting on adding songs to the queue modal, not yet working
Merge branch 'master' of github.com:mmelkko/Web-jukebox

Conflicts:
	web-jukebox/app/views/rooms/show.html.haml