midterm submission
Merge pull request #73 from sarahkrasley/master

midterm submission