modify
Merge branch 'master' of https://github.com/soulsearcher/config

Conflicts:
	dhcpd/README.md