Jonathan charro
Merge branch 'master' of https://github.com/chrisrodz/git-tut

Conflicts:
	filetwo.txt