Error handling tour
Merge branch 'master' of https://github.com/kmcombs/PHYS202-S14
-m "forgot to push when I was working on my laptop"