ajout de truc kikou
Merge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf
Merge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf
Merge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf
gestion de truc kikou
ajout de resurceMerge branch 'master' of https://github.com/jspdown/Nibler-patel-ozouf

Conflicts:
	debug.txt
	ncurses/NcursesLib.cpp