Resistance is now a property of the environment, rather than a property of the cells
Merge branch '0.5.dalen' of github.com:NCFDev/cellular into 0.5.dalen

Conflicts:
	cells.py