In the master branch
change 1
change 2
change 3
change 4
Merge branch 'testing'

Conflicts:
	GitLearning/GitBranch/mBranch.txt