Network finish for now.
Merge branch 'network'

Conflicts:
	neuron.m
	ss00.m