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

Conflicts:
	main.o
	nodes.h
	nodes.o
	str.o