Merge branch 'master' into genre-year
play update
Merge branch 'genre-year' of https://github.com/parland/morganizer into genre-year
Merge branch 'genre-year'

Conflicts:
	MusicOrganizer.ctxt
	package.bluej
yest
test
made a fake import
funcitonlkjil lh ihoi
more nothing
Nonchecked sorting. (i.e. haven't checked if it works...)
Merge commit '0bed12b40adc7916eb3e976bfd2c8fe947fdd158' into GUI

Conflicts:
	MusicOrganizer.ctxt
	MusicOrganizer.java
	Track.java
	doc/.DS_Store
	package.bluej