git add   AndroidManifest.xml
git add  res/values/strings.xml
git add   src/kr/re/ec/zigeon/PhotoViewActivity.java
add
fixed conflicts
scaledimageview applied

wow! no dblclick kk
no hangul updated
commited.
conflict occured