theo's test cases
Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty

OKAY