basic music player
Merge branch 'ethanv'

Conflicts:
	src/view/room.jade