Test changing the test file in master
Changed the test file number to 3 on master.
Added new file on master.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	testFile.xml
	
	Fixed the conflict.