subo c modif
Merge branch 'master' of https://github.com/eapfel/aztest

Conflicts:
	c.txt
merge