Qops enters the bar, and Bjorn offers him a drink.
Merge branch 'master' of https://github.com/ossp/Git-Branchy-Story-Exercise-01 into new_patron
Merge branch 'master' of https://github.com/ossp/Git-Branchy-Story-Exercise-01