Commit do Marcelo com merge
Merge branch 'master' of github.com:prodigasistemas/dojos

Conflicts:
	README.md