Minor tweaks
Merging?
Git is confusing
Is this merge finally working?????

Conflicts:
	code/CircleOfLife3d.m