salut
salut
Merge branch 'master' of https://github.com/RomainFranck/lem_in

Conflicts:
	str.c