merge dos dois
Merge branch 'master' of https://github.com/losa3/gittutorialbasico

Conflicts:
	file1.txt