First
no message
Merge branch 'master' of https://github.com/jihoonLee/HappythonBookProject

Conflicts:
	res/layout/activity_main.xml
	src/com/example/happythonbookproject/MainActivity.java
Before
Merge branch 'master' of https://github.com/dreamwkr17/HappythonBookProject

Conflicts:
	gen/com/example/happythonbookproject/R.java
받아가
Merge branch 'master' of https://github.com/dreamwkr17/HappythonBookProject
버리는거
no message
다넣었음
다이얼로그 버튼 추가 전
끝