Ingles > Castellano
Merge branch 'master' of https://github.com/Florius/TutoGit.git

Conflicts:
	src/TestGIT.c