Pulled out of the closet by Vitamin C
Merge branch 'Canada'
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01