added toronto
Merge branch 'master' of https://github.com/olyfaunt/git-mania

Conflicts:
	cities.html

fixed conflict