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