class work
Merge branch 'master' of https://github.com/rchhibbe/PHYS202-S14
cw