Here's my first exercise.
Merge branch 'master' of https://github.com/sfeschrich/learn-python-the-hard-way
Merging commit