Trying to fix conflicts
Merge branch 'master' of https://github.com/davidMcneil/CSSE304-interpreter
still fixing conflicts