drag and zoom image
Merge branch 'master' of C:\Users\00\Documents\GitHub\AndroidLearing with conflicts.
Merge remote-tracking branch 'origin/master'