Test4
Merge branch 'master' of https://github.com/NTek/Test.git

Conflicts:
	GitTest/src/main.c