Testing branching
Merge remote-tracking branch 'origin/master' into test1

Conflicts:
	Another test/Renamed Test.bat
Merge branch 'master' of https://github.com/Tomazo/Test
Merge branch 'master' of https://github.com/Tomazo/Test

Conflicts:
	Another test/Renamed Test 22.bat