subindo conflito master
commit da master
Adicionaado versao 1.0.1
teste do merge
commit do work