-dns fix
vagrant
Merge branch 'master' of https://github.com/n0needt0/fbg.git

Conflicts:
	setup.sh