Added Calgary to list
Merge branch 'master' of github.com:erizye/git-mania

Conflicts:
	cities.html