commit check
Merge pull request #11 from CMPUT301F13T04/mkmicik-branch

commit check
Merge pull request #12 from CMPUT301F13T04/ftyau-branch

Ftyau branch
commit test