<<<<<<< HEAD csndsugui.py MyMusicASCII.csd MyMusicMIDI.csd ourmusic.py OurMusicASCII.csd OurMusicMIDI.csd activity/activity.info activity/activity-ourmusic.svg setup.py ======= setup.py MyMusicMIDI.csd MyMusicASCII.csd OurMusicMIDI.csd OurMusicASCII.csd activity/activity.info activity/activity-ourmusic.svg csndsugui.py ourmusic.py >>>>>>> 3690ed424760ca6ec230887465f1f2541c5c863a