cleanup
Merge branch 'master' of https://github.com/dedx/PHYS202-S13