Fixed some more stupid mistakes
Merge branch 'master' of https://github.com/bbloomf/christmas-carols