1.5 at home.
Changed the # of cpus.
Fixing conflict.

Merge branch 'master' of github.com:SimonGoring/NoAnalogueError

Conflicts:
	R/shared_run.R