Je me en place ma partie
Merge branch 'master' of https://github.com/YellowS4/ISC-DHCP-Webmin

Conflicts:
	auth.php
	inc/add_plage.php
	inc/head.php
	inc/network.php
	inc/plage.php
	index.php
	styles/auth.css
	styles/style.css

Je met ma partie