merge
Merge branch 'master' of https://github.com/enoughrec/arecordlabel

Conflicts:
	data/all.json