branch.
add file branch.
test branch.
Merge branch 'master' of https://github.com/cuauhtemoc/try_git

Conflicts:
	test.txt