update
Merge branch 'master' of https://github.com/christophersolomon/CompGraphics

Conflicts:
	strandtestTest/both.ino
	strandtestTest/dual.ino
	strandtestTest/single.ino
	strandtestTest/strandtestTest.ino