added branching and such
Merge branch 'master' of https://github.com/hunthunt2010/CompilersGroup2