commint in branch1
in branch
Merge branch 'branch1'

Conflicts:
	ConsoleApplication2/subdir/newfiles.cs
苦苦