add my partial answers
Merge pull request #23 from kjgilbert/master

add my partial answers
Merge remote-tracking branch 'upstream/master'