working before refactor
Merge branch 'master' of git@github.com:Torboto/cmput301W13T07.git