Updating city for everybody
xi'an
changing manny file
changes xi'an
Merge branch 'master' of https://github.com/julieniscool/trainingtwo