newwww
ejdn
dfef
Merge branch 'master' of https://github.com/BaudouinDrou/Stubi

Conflicts:
	tmp/conf/confLevel1.txt
conflit