Add Funcion 2
Merge branch 'master' of https://github.com/aparres/iteso_test

Conflicts:
	hola.c