pushing midterm thing
Merge pull request #36 from GabrielAppleby/master

pushing midterm thing