twelve thing
Merge branch 'master' of github.com:ericgibb/music

Conflicts:
	README.md