텍스트문 수정
afds
Merge branch 'master' of https://github.com/dreamwkr17/HappythonBookProject

Conflicts:
	res/layout/activity_main.xml
Layer8 레이아웃작업
Merge branch 'master' of https://github.com/dreamwkr17/HappythonBookProject

Conflicts:
	gen/com/example/happythonbookproject/R.java
	res/layout/activity_main.xml
Layer8 수정
바코드