eshnil2000
diff --git a/‎README.md‎
Lines changed: 44 additions & 7 deletions b/‎README.md‎
Lines changed: 44 additions & 7 deletions
@@ -13,7 +13,7 @@ In order to support multiple versions of the Hyperledger fabric, this repository
   - Hyperledger fabric v0.5-developer-preview
   - IBM Bluemix Blockchain Service v0.4.2
 
-- [v2.0](https://github.com/ibm-blockchain/learn-chaincode/tree/v2.0) (Coming Soon)
+- [v2.0](https://github.com/ibm-blockchain/learn-chaincode/tree/v2.0)
 
   - Hyperledger fabric v0.6-developer-preview
 
@@ -60,11 +60,11 @@ The following tasks take you through the process of building a pipeline that wil
 - Test your chaincode using the fabric REST API.
 - Repeat.
 
-1. Fork this repository to your GitHub account. This can be accomplished quickly by scrolling up and clicking the **Fork** button at the top of this repository.
+1. Fork this repository to your GitHub account. This can be accomplished quickly by scrolling up and clicking the __Fork__ button at the top of this repository.
 
   ![Fork Button Screenshot](imgs/fork.png)
 
-  "Forking" the repository means creating a copy of this repository under your GitHub account. Note that the fork will fork the entire repository including all the branches. Toggle the **Branch** button on the left to see the available branches.
+  "Forking" the repository means creating a copy of this repository under your GitHub account. Note that the fork will fork the entire repository including all the branches. Toggle the __Branch__ button on the left to see the available branches.
 
   ![Branch Button Screenshot](imgs/branch.png)
 
@@ -101,16 +101,18 @@ The following tasks take you through the process of building a pipeline that wil
   # See what files have changed locally.  You should see chaincode_start.go
   git status
   # Stage all changes in the local repository for commit
-  git add -all
+  git add --all
   # Commit all staged changes.  Insert a short description after the -m argument
   git commit -m "Compiled my code"
   # Push local commits back to https://github.com/<YOUR_GITHUB_ID_HERE>/learn-chaincode/
   git push
+  ```
 
 In order to turn a piece of Go code into chaincode, all you need to do is implement the chaincode shim interface. The three functions you have to implement are **Init**, **Invoke**, and **Query**. All three functions have the same prototype; they take in a 'stub', which is what you use to read from and write to the ledger, a function name, and an array of strings. The main difference between the functions is when they will be called. In this tutorial you will be building a chaincode to create generic assets.
 
 ### Dependencies
 
+>>>>>>> 4fea23b9bedde404858f7ee58cd33f2f7433dd4b
 The `import` statement lists a few dependencies that you will need for your chaincode to build successfully.
 
 - `fmt` - contains `Println` for debugging/logging.
@@ -128,6 +130,12 @@ func (t *SimpleChaincode) Init(stub *shim.ChaincodeStub, function string, args [
     if len(args) != 1 {
         return nil, errors.New("Incorrect number of arguments. Expecting 1")
     }
+=======
+func (t *SimpleChaincode) Init(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
+	if len(args) != 1 {
+		return nil, errors.New("Incorrect number of arguments. Expecting 1")
+	}
+>>>>>>> 4fea23b9bedde404858f7ee58cd33f2f7433dd4b
 
     err := stub.PutState("hello_world", []byte(args[0]))
     if err != nil {
@@ -153,8 +161,13 @@ This is done by using the stub function `stub.PutState`. The function interprets
 In your `chaincode_start.go` file, change the `Invoke` function so that it calls a generic write function.
 
 ```go
+<<<<<<< HEAD
 func (t *SimpleChaincode) Invoke(stub *shim.ChaincodeStub, function string, args []string) ([]byte, error) {
     fmt.Println("invoke is running " + function)
+=======
+func (t *SimpleChaincode) Invoke(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
+	fmt.Println("invoke is running " + function)
+>>>>>>> 4fea23b9bedde404858f7ee58cd33f2f7433dd4b
 
     // Handle different functions
     if function == "init" {
@@ -171,6 +184,7 @@ func (t *SimpleChaincode) Invoke(stub *shim.ChaincodeStub, function string, args
 Now that it's looking for `write` let's make that function somewhere in your `chaincode_start.go` file.
 
 ```go
+<<<<<<< HEAD
 func (t *SimpleChaincode) write(stub *shim.ChaincodeStub, args []string) ([]byte, error) {
     var key, value string
     var err error
@@ -187,6 +201,24 @@ func (t *SimpleChaincode) write(stub *shim.ChaincodeStub, args []string) ([]byte
         return nil, err
     }
     return nil, nil
+=======
+func (t *SimpleChaincode) write(stub shim.ChaincodeStubInterface, args []string) ([]byte, error) {
+	var key, value string
+	var err error
+	fmt.Println("running write()")
+
+	if len(args) != 2 {
+		return nil, errors.New("Incorrect number of arguments. Expecting 2. name of the key and value to set")
+	}
+
+	key = args[0]                            //rename for fun
+	value = args[1]
+	err = stub.PutState(key, []byte(value))  //write the variable into the chaincode state
+	if err != nil {
+		return nil, err
+	}
+	return nil, nil
+>>>>>>> 4fea23b9bedde404858f7ee58cd33f2f7433dd4b
 }
 ```
 
@@ -205,8 +237,13 @@ As the name implies, `Query` is called whenever you query your chaincode's state
 In your `chaincode_start.go` file, change the `Query` function so that it calls a generic read function, similar to what you did in `Invoke`.
 
 ```go
+<<<<<<< HEAD
 func (t *SimpleChaincode) Query(stub *shim.ChaincodeStub, function string, args []string) ([]byte, error) {
     fmt.Println("query is running " + function)
+=======
+func (t *SimpleChaincode) Query(stub shim.ChaincodeStubInterface, function string, args []string) ([]byte, error) {
+	fmt.Println("query is running " + function)
+>>>>>>> 4fea23b9bedde404858f7ee58cd33f2f7433dd4b
 
     // Handle different functions
     if function == "read" {                            //read a variable
@@ -221,9 +258,9 @@ func (t *SimpleChaincode) Query(stub *shim.ChaincodeStub, function string, args
 Now that it's looking for `read`, let's create that helper function somewhere in your `chaincode_start.go` file.
 
 ```go
-func (t *SimpleChaincode) read(stub *shim.ChaincodeStub, args []string) ([]byte, error) {
-    var key, jsonResp string
-    var err error
+func (t *SimpleChaincode) read(stub shim.ChaincodeStubInterface, args []string) ([]byte, error) {
+	var key, jsonResp string
+	var err error
 
     if len(args) != 1 {
         return nil, errors.New("Incorrect number of arguments. Expecting name of the key to query")