Merge branch 'master' of https://github.com/BuriedStPatrick/ChoirFrontendGroupC.git