Jose
Merge branch 'master' of https://github.com/jmaralv/git_testing

Conflicts:
	new.txt