Second Attempt at Second Chapter

The delay makes this chapter all the sweeter.
A Merging

This merge will hopefully be what I want.

Merge branch 'master' of https://github.com/ossp/Git-Branchy-Story-Exercise-01
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01