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

Conflicts:
	Flashlet/BlankCard.jpg
	Flashlet/BlankCard.psd
	Flashlet/Cards.psd
	Flashlet/LineCard.jpg
	Flashlet/LineCard.psd
	Flashlet/LoadSet/Cards.jpg
	Flashlet/Page one.psd
	Flashlet/libraries/LoadSet/LoadSet.pde