updating .h and adding my functions to .c
merging