second commit
ezeed
Merge branch 'master' of https://github.com/oulein/essai

Conflicts:
	hello.c