Merge pull request #7 from mferraco/master

all cities working again on map
I made alot of changes but I plan on working on it some more tonight.
Merge pull request #8 from aneurycasado/master

Changes