Exercise 10
Merge branch 'master' of github.com:kdonahue614/lpthw

So I just git pulled, and I'm not sure I should have.  Here's what happened,
I changed the naming convention on my local files, from ex1.py to ex01.py
Then I git added them all, and comitted them.  Then I went to github to see
what happened, and I had two copies of the files, ex1.py and an ex01.py.

I didn't like that at all, so in github, I went to each file with the ex01.py
name, and deleted them from the repo.  Then I just went along with ex10, and
when I went to add it, I got this conflict.  I think it's going to merge.

Anyway, maybe I should have branched, to rename the files?  I wonder how
that would be done?