midterm
Merge pull request #53 from ellisbene/master

midterm