Music Note now has a Color property that affects the color it shows up as on the screen. Color can now be saved and loaded from file.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/hanon/app/model/music/MusicNote.java