Merge branch 'HEAD' of git@github.com:agoransson/JSON-processing.git

Conflicts:
	examples/README
	examples/create_jsonobject/create_jsonobject.pde

Author: agoransson

examples/README

@@ -0,0 +1 @@
+add examples for your tool here. 

examples/create_jsonobject/create_jsonobject.pde

@@ -1,8 +1,11 @@
 /*
  * JSON 4 Processing
  * Basic example 1: Creating a JSON Object
+<<<<<<< HEAD
  *
  * Good for sending values that has a specific meaning (complex values)
+=======
+>>>>>>> origin/HEAD
  */
 
 import org.json.*;
@@ -14,8 +17,11 @@ void setup(){
 
   // 2. Add some content to the object
   myJsonObject.put( "myIntegerValue", 7 );
+<<<<<<< HEAD
 
   println( myJsonObject );
+=======
+>>>>>>> origin/HEAD
 }
 
 void draw(){