resolving conflicts and removing suggestion to import both numpy and as np

Author: valentina-s

_episodes/01-numpy.md

@@ -808,7 +808,7 @@ the graphs will actually be squeezed together more closely.)
 > to make a shortcut like so: `import numpy as np`.
 > If you ever see Python code online using a NumPy function with `np`
 > (for example, `np.loadtxt(...)`), it's because they've used this shortcut.
-{: .callout}
+> When working with other people, it is important to agree on a convention of how common libraries are imported.
 
 > ## Check Your Understanding
 >
@@ -1104,9 +1104,9 @@ the graphs will actually be squeezed together more closely.)
 > > print(D)
 > > ~~~
 > > {: .python}
-> > 
+> >
 > > ~~~
-> > D = 
+> > D =
 > > [[1 3]
 > >  [4 6]
 > >  [7 9]]
@@ -1115,19 +1115,19 @@ the graphs will actually be squeezed together more closely.)
 > {: .solution}
 >
 > > ## Solution
-> > 
+> >
 > > An alternative way to achieve the same result is to use Numpy's
 > > delete function to remove the second column of A.
-> > 
+> >
 > > ~~~
 > > D = numpy.delete(A, 1, 1)
 > > print('D = ')
 > > print(D)
 > > ~~~
 > > {: .python}
-> > 
+> >
 > > ~~~
-> > D = 
+> > D =
 > > [[1 3]
 > >  [4 6]
 > >  [7 9]]

_episodes/02-loop.md

@@ -154,6 +154,38 @@ but there must be a colon at the end of the line starting the loop,
 and we must indent anything we want to run inside the loop. Unlike many other languages, there is no
 command to signify the end of the loop body (e.g. end for); what is indented after the for statement belongs to the loop.
 
+
+> ## What's in a name? {.callout}
+> In the example above, the loop variable was given the name `char` as a mnemonic; it is short for 'character'. 'Char' is not a keyword in Python that pulls the characters from words or strings. In fact when a similar loop is run over a list rather than a word, the output would be each member of that list printed in order, rather than the characters.
+>~~~ {.python}
+>list = ['oxygen','nitrogen','argon']
+>for char in list:
+>    print(char)
+>~~~
+>
+>~~~ {.output}
+>oxygen
+>nitrogen
+>argon
+>~~~
+> We can choose any name we want for variables. We might just as easily have chosen the name `banana` for the loop variable, as long as we use the same name when we invoke the variable inside the loop:
+>~~~ {.python}
+>word = 'oxygen'
+>for banana in word:
+>    print(banana)
+>~~~
+>
+>~~~ {.output}
+>o
+>x
+>y
+>g
+>e
+>n
+>~~~
+> It is a good idea to choose variable names that are meaningful, otherwise it would be more difficult to understand what the loop is doing.
+
+
 Here's another loop that repeatedly updates a variable:
 
 ~~~