Merge pull request #5 from MattyAyOh/hw5

Hw5
Merge pull request #6 from MattyAyOh/master

Merge pull request #5 from MattyAyOh/hw5