exercise1two

exercise1two
changez r fer everyone

we like changez
changez

kool
Merge branch 'exercise1two' into exercise1one

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