Merge branch 'master' of https://github.com/mazubieta/git.intro

Conflicts:
	README
Merge branch 'master' of https://github.com/mazubieta/git.intro