changed test.txt
Merge branch 'master' of https://github.com/lstarrett/jukebox

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/lstarrett/jukebox
made better