yo
Merge branch 'master' of github.com:Terit/git-mania

Conflicts:
	cities.html