added midterm work
Merge pull request #70 from opihana/master

Midterm