paris
Merge branch 'master' of https://github.com/BrechasTICs/curso-git

Conflicts:
	README.md