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

Conflicts:
	libs/android-support-v4.jar
	project.properties
	src/com/example/happythonbookproject/MainActivity.java