Artur e Patricia foram adicionados
Merge branch 'master' of https://github.com/guifroes/git-dojo

Conflicts:
	membros.txt