new branch commit
master commit
Merge branch 'newbranch'master commit
Conflicts:
	Proyecto-Android/hola.txt