not sure what I changed..
Merge branch 'master' of https://github.com/mchaiken/pd1-Snell-sLaw-Chaiken-Piccato-Romanoff

Conflicts:
	Flashlet/Button.pde
	Flashlet/setName.pde