Merged MusicNotes into Note class. Updated appropriate classes to work with new Note class. Formatting.