:)
Merge branch 'master' of https://github.com/edgarjcfn/git-tutorial

Conflicts:
	Tutorial.md