git add	modified:   src/kr/re/ec/zigeon/handler/SoapParser.java
git checkout -- src/kr/re/ec/zigeon/BubbleActivity.java
git checkout --  src/kr/re/ec/zigeon/GCMIntentService.java
Merge remote-tracking branch 'origin/KTHWorking' into newcho

Conflicts:
	src/kr/re/ec/zigeon/handler/SoapParser.java
test success
loading time change test
cmt
commit
cmt
no hangul haha
git add   res/values/strings.xml
git add src/kr/re/ec/zigeon/LandmarkActivity.java
Merge remote-tracking branch 'origin/develop' into Jool

Conflicts:
	src/kr/re/ec/zigeon/LandmarkActivity.java
no hangul applied
git add res/values/strings.xml
git add src/kr/re/ec/zigeon/LandmarkActivity.java
commit
LandmarkWriteActivity & MapActivity added
workin
Merge remote-tracking branch 'origin/Jool' into develop

Conflicts:
	res/values/strings.xml
landmark_write added
Merge remote-tracking branch 'origin/Jihong' into develop

Conflicts:
	src/kr/re/ec/zigeon/LandmarkActivity.java
	src/kr/re/ec/zigeon/PostingActivity.java
>>>>>>>>> HEAD removed

uh hew