hw3/5

hw3/5
Merge pull request #57 from shinylee/master

hw3/5