Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
CRA-323 Bug fix again
CRA-540 - Write error messages when distribution-with-trend can not be setimated from wells
CRA-541: Changed procedure by now merging branch into master before pulling from upstream, and then committing before pushing to origin. Also added graphical illustration of process.
Merge branch 'master' of git://github.com/CRAVA/crava
Merge pull request #17 from RagnarHauge/master

CRA-541: Update working procedure for Git/GitHub
Revert "CRA-323 Bug fix again"

This reverts commit 249197076f4a254e6ebb7077d60f9bb8d7892b1d.
Revert "Revert "CRA-323 Bug fix again""

This reverts commit 6cba9d4adaa7c6b50fa72f431268b54e36f255ee.
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
CRA-536 When rock physics models are estimated from wells, and temporal correlation is not given from file, only the temporal correlation should be estimated directly from the wells.
Merge branch 'master' of https://github.com/CRAVA/crava
Merge pull request #19 from ulvmoen/master

When rock physics models are estimated from wells, and temporal correlation is not given from file, only the temporal correlation should be estimated directly from the wells.
Merge branch 'master' of https://github.com/CRAVA/crava
CRA-323 Removed some tabs