modified
Merge branch 'testing' of https://github.com/becky168/GitHubTest into testing

Conflicts:
	testing.txt