undid fixfixed stop conductor size
Merge branch 'master' of https://github.com/VT-CHCI/SoundOfFractions

# By Daniel Monzel
# Via Daniel Monzel
* 'master' of https://github.com/VT-CHCI/SoundOfFractions:
  catching up log
Fixed the unrolling issue with beads from bead to line
Fixed clipping on measureRepViews when changing scale and removed conductor draggability.
Changed transition dispatch events
Added remaining animations
Merge branch 'PeteyDebug' into release

* PeteyDebug:
  Added remaining animations
  Changed transition dispatch events
  Fixed clipping on measureRepViews when changing scale and removed conductor draggability.
  Fixed the unrolling issue with beads from bead to line
  undid fixfixed stop conductor size

Conflicts:
	doc/SOF.gstencil
	doc/SOF.jpg