foo.txt en rama-2
Merge branches 'master' and 'rama-2'

Conflicts:
	foo.txt