Merging toggle changes 1
Tidied up scene
Added catmull rom functions