added calgary
Merge branch 'master' of github.com:ChristianFenn/git-mania
I have made another change
merge fix