finished hw 1
Merge branch 'master' of https://github.com/aorlandogit/cmpt241