test_git_2 commit
Merge branch 'master' of https://github.com/fattoLiu/testrepo.git

Conflicts:
	testGit/src/com/example/testgit/MainActivity.java