ex1.py exercise1one branch

I am learning GitHub branching in preparation for a hackathon I am
doing this weekend.
Merge branch 'exercise1one' into exercise1two