exercise1two

exercise1two
changez r fer everyone

we like changez
Merge branch 'exercise1two'
changez

kool
Merge branch 'exercise1two' into exercise1one

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

closer
Merge branch 'exercise1one'
Merge branch 'master' into exercise1one
Merge pull request #3 from JorgeAntonio512/exercise1one

Exercise1one