Merge pull request #4 from simon-kim/master

Pulling
Merge pull request #5 from simon-kim/homework2

Merge pull request #4 from simon-kim/master