cityList modified
readme conflicts merged