xcode won’t discard changes
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added pinch and pan to map
Merge remote-tracking branch 'origin/master'