merge

README.md

@@ -10,7 +10,6 @@ On November 9th, 2016, we released the IBM Blockchain Service v1.0 based on Hype
 - [Marbles - Branch v2.0](https://github.com/ibm-blockchain/marbles/tree/v2.0)
 	- Works with Hyperledger fabric `v0.6-developer-preview`
 
-
 If for some reason you need instructions for the v0.4.2+ level of the service, they are here, but support of these instructions is
 best effort only.
 

create_blockchain_bluemix.md

@@ -0,0 +1,42 @@
+### Creating a Blockchain Network in IBM Bluemix
+
+1.  Create a Bluemix IBM Blockchain Network.  Don't fret, this is as simple as clicking on a particular button and filling out a text input field or two. 
+  There is a Bluemix tile that will create you your own personal blockchain network. All you have to do is find the tile and give the network a name. 
+
+  1. First login to [Bluemix](https://console.ng.bluemix.net)  
+  Go here If you already have a Blockchain network and just want to [launch the dashboard and grab the credentials](#get_credentials)
+
+
+  1. Click the "Catalog" link on the top navigation bar
+
+![](/doc_images/bluemix_ibc1.png)
+
+  1. Find and click the "Blockchain" tile. Type `blockchain` in the search box to filter the list.
+
+![](/doc_images/bluemix_ibc2.png)
+
+  1. The space used is listed in the Name/Region/Org/Space bar at the top right.  If you want to create the network in a different space, click this bar to bring up the option to change or create a new space.  
+  1. Click on the text bar under "Service Name" to rename "Blockchain-bx" to "myblockchain" without the quotes
+  1. Leave the "App:" field as "Leave unbound" (unless you already have an application, but you probably don't yet)
+  1. Leave the "Selected Plan" as its default value
+  1. Leave the "Credential name" field as its default value
+
+  1. Click the "CREATE" button at the bottom right.
+
+![](/doc_images/bluemix_ibc3.png)
+
+<a name ="get_credentials" ></a>  1. If all goes well you should be on the manage screen for your new service. Click the "LAUNCH" button to see the dashboard for your network. 
+	- You should see a few peers listed in the first table
+	- From here you can monitor if your peers crash, if the chaincode containers are running, and view logs for all
+
+![](/doc_images/bluemix_ibc4.png)
+
+![](/doc_images/bluemix_ibc5.png)
+
+  (Note if you find yourself on the main Bluemix Dashboard and want to get back to this service screen just click the tile name "myblockchain" in the "Services" section)
+
+The network is all setup.  Since we are running the app locally, we need to **copy the peer data and pass it to our demo node.js application**.
+
+1. Click the "Service Credentials" link on the very bottom left of the dashboard.
+1. This will open the file in your browser.  Replace the entire contents of the `mycredentials.json` file in the root of the `/git/<project>` directory you cloned earlier with this text.
+1. continue by [run marbles on local machine](#runlocal) below.

demo_prereqs

@@ -0,0 +1,5 @@
+Install the prereqs on your local system to allow you to run the marbles or CP-Web app locally.  If you completed the [learn chaincode](https://github.com/IBM-Blockchain/learn-chaincode) demo, your environment is ready to go.  If not, then 
+follow the [IBM Blockchain development setup instructions](https://github.com/IBM-Blockchain/learn-chaincode/blob/v2.0/docs/setup.md) and install the following components:  
+  -  Git - Needed to clone the code locally to your system.  
+  -  Node.js - Needed to install and run the app locally.  
+There are more components listed in the setup link, but these are all you need to run for the marbles and CP-Web demo flows.