Started supporting directories/mp3, still doesn't quite work yet
Merge remote-tracking branch 'origin/master'

Conflicts:
	dan