Week 10 work
Merge branch 'master' of https://github.com/wsnyderPHYS202/PHYS202-S13