made some fixes
fixed merge conflicts
Merge branch 'master' of github.com:jaypatelh/cool-compiler