Added functions to estimate zinm.
Merge branch 'master' of github.com:gui11aume/zinm

Conflicts:
	test/tests.c
	zinm.c