commit sérieux
Merge branch 'master' of https://github.com/Raeik/nibbler

Conflicts:
	SRC/config
	SRC/sources/component/Network.cpp
des trucs