new change
Merge branch 'master' of https://github.com/TangGuangzhou/Demo.git

Conflicts:
	src/com/example/demo/BranchActivity.java