Testing branch commit
Master branch commit
myfunc.h changed
Merge branch 'testing'

Conflicts:
	WhySoSerious.c
Master 2 branch commit