Merge pull request #30 from joshco/master

joshco homework 1
joshco homework 2