Commited to GitHub
Merge branch 'master' of https://github.com/muglug/ChoirAngel

Had to redo the commit