tercer commit e1
cuarto commit eA
Merge branch 'master' of https://github.com/erik1092/ITESO1

Conflicts:
	hello.c