Resolve Merge Conflict

	Very minor fix to clean up comment, erased blank line (line 209 basic_usage.md)
	Added a session close the Interactive Session in the 'Getting Started' tutorial
		-so that no exceptions are thrown when a user tests later examples in the same python kernel.
	Highlighted 't[i,j,k]' for read consistency in tutorial (line 21, resources/dim_types.md)

Change-Id: I9c0d8a6f6651bbb6a00bddecc0977b512e394669

tensorflow/g3doc/get_started/basic_usage.md

@@ -175,6 +175,9 @@ x.initializer.run()
 sub = tf.sub(x, a)
 print sub.eval()
 # ==> [-2. -1.]
+
+# Close the Session when we're done.
+sess.close()
 ```
 
 ## Tensors
@@ -203,7 +206,6 @@ new_value = tf.add(state, one)
 update = tf.assign(state, new_value)
 
 # Variables must be initialized by running an `init` Op after having
-
 # launched the graph.  We first have to add the `init` Op to the graph.
 init_op = tf.initialize_all_variables()
 

tensorflow/g3doc/resources/dims_types.md

@@ -18,7 +18,7 @@ Python list) has a rank of 2:
 A rank two tensor is what we typically think of as a matrix, a rank one tensor
 is a vector. For a rank two tensor you can acccess any element with the syntax
 `t[i, j]`.  For a rank three tensor you would need to address an element with
-'t[i, j, k]'.
+`t[i, j, k]`.
 
 Rank | Math entity | Python example
 --- | --- | ---