Suppression resultat.old
Merge branch 'master' of https://github.com/soncoerok/projet_supervision_agile

Conflicts:
	automaticdiscover/src/main/java/com/emn/fil/automaticdiscover/nmap/Nmap.java
	automaticdiscover/target/classes/com/emn/fil/automaticdiscover/nmap/Nmap.class