almost there
fixed merge conflicts in test file
Added in catch for wrong number of arguments
Merge branch 'master' of https://github.com/krwenholz/Compiler_MiniJava