Arreglado problema en myfunctions
fix merger
Merge

Conflicts:
	myfunctions.c
	myfunctions.h