Basic discussion of GP model
Merge branch 'master' into gptext

Conflicts:
	latex/biblio.bib
Merge pull request #2 from mrtommyb/gptext

Discussion of GP model