delete btn1 from bubbleactivity
testetesettest

sddsfaafds
Merge pull request #1 from wlghd1016/master

BubbleActivity에서 버튼이 사라지는 경이로운 기적
test commit
test commit2
Merge pull request #2 from wnflrj123/JWorking

J working
Create README.md
Update README.md
Update README.md
Merge pull request #1 from KimTaehee/master

?test k
dj test
Merge pull request #3 from newcho913/master

dj test commit
update 33
Update LandmarkActivity.java
sb
UTF-8
UTF-8 2/2
??
git add src/kr/re/ec/zigeon/LandmarkActivity.java
git add src/kr/re/ec/zigeon/MapListActivity.java
git add src/kr/re/ec/zigeon/PostingActivity.java
Merge remote-tracking branch 'origin/KTHWorking'

Conflicts:
	gen/kr/re/ec/zigeon/R.java
	res/layout/activity_bubble.xml
	res/values/strings.xml
	src/kr/re/ec/zigeon/BubbleActivity.java
	src/kr/re/ec/zigeon/LandmarkActivity.java
	src/kr/re/ec/zigeon/MapListActivity.java
	src/kr/re/ec/zigeon/PostingActivity.java