change to local 10
Merge branch 'master' of https://github.com/ChingChien/Test

Conflicts:
	my.txt
Mergerd
Test12
Merge pull request #2 from ChingChien/newBranch

New branch