why ddo?
why ddo 2?

wh
what r u doing Mr. GitHub???
oo hi nice to meet you
git add res/values/strings.xml
git add src/kr/re/ec/zigeon/BubbleActivity.java
git add src/kr/re/ec/zigeon/LandmarkActivity.java
git add src/kr/re/ec/zigeon/PostingActivity.java
Merge remote-tracking branch 'origin/KTHWorking'

Conflicts:
git add	src/kr/re/ec/zigeon/BubbleActivity.java
git add	src/kr/re/ec/zigeon/PostingActivity.java