added Calgary
Merge branch 'master' of github.com:tmcgoo/git-mania

Conflicts:
	cities.html

tZZZZZç# with '#' will be ignored, and an empty message aborts the commit.