changed on testing
another change on testing
removed new text document.txt
Merge branch 'master' into Testing

Conflicts:
	yetAnotherFile.txt