Tom the wizard performed magic
Merge branch 'master' of https://github.com/ossp/Git-Branchy-Story-Exercise-01