Went to the Super Hero Conference with Darko

Now fighting crime on the streets of Canada (where the conference is held)
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01
Merge branch 'master' of github.com:ossp/Git-Branchy-Story-Exercise-01