hmm
Merge branch 'master' of https://github.com/gobfrey/medmus

Conflicts:
	.gitignore