A change
Merge branch 'master' of https://github.com/KasonChan/GitTest

Conflicts:
	CTest.c