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

commit check