finished homework2
modified homework2
Merge pull request #58 from quanhuynh/master

finished homework2