finished midterm
Merge branch 'master' of https://github.com/dvaage/PHYS202-S14