Initial commit
Merge branch 'master' of github.com:gente-boa/gente-boa
and add new README
Conflicts:
	client/lib/confUi.js
Merge branch 'master' of github.com:gente-boa/gente-boa

Conflicts:
	client/lib/confUi.js