sdsd
Merge branch 'master' of https://github.com/christoffer-Van/git-mania

Conflicts:
	cities.html