Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
CRA-540 - Write error messages when distribution-with-trend can not be setimated from wells
CRA-540 Write error messages when distribution-with-trend can not be estimated from wells
Pull from upstream
Merge branch 'master' of https://github.com/CRAVA/crava

Conflicts:
	src/kriging2d.cpp
Merge pull request #18 from ulvmoen/master

Write error messages when distribution-with-trend can not be estimated from wells