argh
arggg Merge branch 'master' of https://github.com/mdsumner/SGAT_work

Conflicts:
	curve.model/run.R