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

Conflicts:
	etc/resolv.conf