durp
Merge branch '0.2.cells' of github.com:NCFDev/cellular into 0.2.cells

Conflicts:
	cells.py