hw 4 pts 1 and 2
Merge pull request #1 from jmej/jmej

hw 4 pts 1 and 2