resolving types
Merge pull request #43 from CMPUT301F13T05/testbranch

resolving types