teste conf
Merge branch 'master' of http://github.com/thiagosoares/teste01.git

Conflicts:
	README.md