sprockets...
merge
re-integrating citymap
City map stuff working again