Trying to merge Jeff's code with mine for extracellular stim
Merge commit '00a25e6c9389d7e946cc78a4720f9b37c2bd1647'

Conflicts:
	matlab_code/+NEURON/+simulation/@extracellular_stim/extracellular_stim.m

Uhhhhhhhhhh