conflict?
Merge branch 'master' of https://github.com/studioalgorhythmics/studio_github

Conflicts:
	criticality/CA_with_arduino/CA.pde
	criticality/CA_with_arduino/CA_with_arduino.pde