added type checking for locals and stack, and merging
Merge branch 'master' of github.com:ColtonPhillips/seng480a-assignment1