testing merging
Merge remote-tracking branch 'origin/master' into test1

Conflicts:
	Another test/Renamed Test.bat