Merge pull request #3 from Karmeow/hw2

Hw2
Merge pull request #5 from Karmeow/hw2

Hw2