final version
Merge branch 'master' of https://github.com/jdewasseige/prob_matlab_num

Conflicts:
	p6/test_matlab6.m