Preparing for merge
Merge branch 'master' of https://github.com/jamesrobertlloyd/gp-structure-search

Conflicts:
	latex/gpss.tex