Bob - Bob is in Albany now

Bob is in Albany waiting for a taxy.
Merge branch 'bobBranch'
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01