modified testing.txt in local
Merge branch 'master' of https://github.com/becky168/GitHubTest

Conflicts:
	testing.txt