Escribi INCEPTION
Merge branch 'master' of https://github.com/FutoRicky/git-tut

Conflicts:
	filetwo.txt