temp
Merge branch 'practice4' of https://github.com/cutecool/HCI into practice4

Conflicts:
	libproject/appcompat_v7/bin/android-support-v7-appcompat.jar
修改gitignore