finished hw 2
fixed message error
Merge pull request #57 from ashleye6/master

finished hw 2