Merge branch 'exercise1two' into exercise1one

Conflicts:
Exercise 1 testing GitHub branching/exercise1one/ex1.py