obj fun
Merge branch 'master' of github.com:misteliy/sampling

Conflicts:
	obj_fun.f90