Merge branch 'master' of https://github.com/Adrian323/CC_Test2

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

Conflicts:
	Test/TEST.txt