J Unit Testing. Still can't get tests to run
Merge branch 'master' of https://github.com/kylejamesross/CMPUT301W13T09
Merge branch 'master' of https://github.com/kylejamesross/CMPUT301W13T09.git