COMENTARIO LOCAL
Merge branch 'remotebranch' of https://github.com/juanraposo/gittest into trackedremotebranch

Conflicts:
	A.txt