Merge pull request #2 from CMPUT301F14T03/master

test cases running