Hello2
Merge branch 'master' of
https://github.com/zhoudengfengderek/android-git-test.git

Conflicts:
	GitTestDemo/src/com/derek/gittestdemo/MainFragment.java