minor
dfg
hjkhj
updated
minor
Merge branch 'update-edit'

Conflicts:
	MusicOrganizer.ctxt
	package.bluej
Merge branch 'master' of https://github.com/parland/morganizer

Conflicts:
	MusicOrganizer.ctxt
	package.bluej