commit2
try1
Merge branch 'master' of https://github.com/dreamwkr17/HappythonBookProject

Conflicts:
	src/com/example/happythonbookproject/MainActivity.java