commit2
Revert "commit"

This reverts commit 60f9c95c88d3936d8d3d797b2ee22f12b89a2af2.
Revert "Revert "commit""

This reverts commit 17d9f93b690d33dbbc8207a98174d9f32ffc8cca.
try1
First
Merge branch 'master' of https://github.com/jihoonLee/HappythonBookProject

Conflicts:
	libs/android-support-v4.jar
	project.properties
	src/com/example/happythonbookproject/MainActivity.java
Merge branch 'master' of https://github.com/dreamwkr17/HappythonBookProject

Conflicts:
	src/com/example/happythonbookproject/MainActivity.java
First
Merge branch 'master' of https://github.com/dreamwkr17/HappythonBookProject

Conflicts:
	res/layout/activity_main.xml