Test

Test
Merge remote-tracking branch 'origin/Test-Branch'

Conflicts:
	Test/TEST.txt
T
Merge branch 'master' of https://github.com/Adrian323/CC_Test2

Conflicts:
	Test/A.txt
	Test/TEST.txt