testConflit
Merge branch 'master' of https://github.com/cfarot/testGit

Conflicts:
	test.c