c code
Merge branch 'master' of https://github.com/sando22/TP-tests

Conflicts:
	test.rb