My midterm
Merge pull request #9 from blakerdarling/master

My midterm