change and commit to testing branch
commit on master for changes
Merge branch 'testing'

Conflicts:
	6th/LearnGit.txt
Merge branch 'master' of https://github.com/josiezhou/January

Conflicts:
	6th/LearnGit.txt