Merge branch 'master' of https://github.com/LosTortugueros/LoggerNuitInfo

Conflicts:
	src/Fenetre.java
	src/Sender.java