import
Merge branch 'master' of github.com:ceefour/bonjour-quick

Conflicts:
	.gitignore