Merge branch 'master' of https://github.com/mchaiken/pd1-Snell-sLaw-Chaiken-Piccato-Romanoff

Conflicts:
	Flashlet/SubmitButton.pde
	Flashlet/setName.pde
sync
Merge branch 'master' of https://github.com/mchaiken/pd1-Snell-sLaw-Chaiken-Piccato-Romanoff

Conflicts:
	Flashlet/SubmitButton.pde
	Flashlet/setName.pde