Matrix model done.
Merge branch 'master' into lasse
First draft of the conjugate gradient method
Merge pull request #1 from lybeck/lasse

Lasse
Merge pull request #2 from lybeck/roope

Roope
Merged branch master