two seconds
Merge remote-tracking branch 'upstream/master' into slower-blink

Conflicts:
	blink.ino