Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 0 insertions, 31 deletions

diff --git a/docs/source/arduino/setup.rst b/docs/source/arduino/setup.rst
deleted file mode 100644
index 05911ed..0000000
--- a/docs/source/arduino/setup.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-.. _arduino-setup:
-
-setup()
-=======
-
-The setup() function is called when a sketch starts. Use it to
-initialize variables, pin modes, start using libraries, etc. The
-setup function will only run once, after each powerup or reset of
-the Arduino board.
-
-
-
-Example
-~~~~~~~
-
-::
-
-     
-    int buttonPin = 3;
-    
-    void setup()
-    {
-      Serial.begin(9600);
-      pinMode(buttonPin, INPUT);
-    }
-    
-    void loop()
-    {
-      // ...
-    }
-