Connected city image to scrollview
needs to set bounds on scrollview
Merge remote-tracking branch 'github/master'