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

Conflicts:
	res/layout/activity_main.xml
	src/com/example/happythonbookproject/MainActivity.java
받아가
Layer8 레이아웃작업
Merge branch 'master' of https://github.com/dreamwkr17/HappythonBookProject

Conflicts:
	gen/com/example/happythonbookproject/R.java
	res/layout/activity_main.xml