del
del class
git ignore
delete
Merge branch 'genre-year'

Conflicts:
	MusicOrganizer.class