Updated city slug in template, changed all the URLs
Merge branch 'gh-pages' of http://github.com/tfrce/1984Day

Conflicts:
	preview/city.template
	preview/index.html