lkjsdl;fkajsdkl;fjasdl
kajsldhfkshdfkhlkhkklajsdfk
Merge branch 'master' of github.com:astopo/git-mania

Conflicts:
	cities.html