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

Conflicts:
	src/com/example/demo/BranchActivity.java
local change
Merge remote-tracking branch 'origin/master' into demo_branch1

Conflicts:
	src/com/example/demo/BranchActivity.java
Merge branch 'master' into demo_branch1