Fixed accidentally missed merge issues
Merge branch 'master' of https://github.com/liammaier/CompilersCool