add brisbane
Merge branch 'master' of github.com:jbrunson/git-mania
resolved conflict
Conflicts:
	cities.html