Some small changes
Added city locations
Merge branch 'geocron' of github.com:UngodlySpoon/ns3 into geocron