Katy wrote this
Merge branch 'master' of https://github.com/INF1-HACK/Team2-MusicGenerator