t1
Merge remote-tracking branch 'origin/master'
집에꺼 commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_talksroom.xml
	src/com/hipits/emotionbusan/activity/TalksRoomActivity.java