adicionando arquivo teste5
commit
commit
Merge branch 'issue1'

Conflicts:
	file5
asd
asda
asda
Merge branch 'master' of github.com:victorhugofranca/treinamento
asda
a