Merge remote-tracking branch 'upstream/master'

Author: nonhermitian

.github/CODEOWNERS

@@ -3,25 +3,24 @@
 
 # Codeowners for individual folders
 qiskit/* @jaygambetta
+qiskit/aer/* @chriseclectic @jaygambetta
+qiskit/ignis/* @dcmckayibm @jaygambetta
 
-community/hello_world/* @quantumjim
-community/hello_world/*/* @quantumjim
-community/games/* @quantumjim
-community/games/*/* @quantumjim
+community/hello_world/* @quantumjim @aasfaw
+community/hello_world/*/* @quantumjim @aasfaw
+community/games/* @quantumjim @aasfaw
+community/games/*/* @quantumjim @aasfaw
 
-community/terra/* @attp @ajavadia
-community/terra/*/* @attp @ajavadia
-community/algorithms/* @attp @ajavadia
+community/terra/* @attp @ajavadia @aasfaw
+community/terra/*/* @attp @ajavadia @aasfaw
+community/algorithms/* @attp @ajavadia @aasfaw
 
 community/aqua/* @chunfuchen @pistoia
 community/aqua/*/* @chunfuchen @pistoia
 community/aqua/*/*/* @chunfuchen @pistoia
 
-community/awards/teach_me_qiskit_2018/* @rraymondhp
-community/awards/teach_me_qiskit_2018/*/* @rraymondhp
+community/awards/teach_me_qiskit_2018/* @rraymondhp @aasfaw
+community/awards/teach_me_qiskit_2018/*/* @rraymondhp @aasfaw
 
-community/ignis/* @dcmckayibm
-qiskit/ignis/* @dcmckayibm
-
-community/aer/* @chriseclectic
-qiskit/aer/* @chriseclectic
+community/ignis/* @dcmckayibm @aasfaw
+community/aer/* @chriseclectic @aasfaw

README.md

@@ -23,6 +23,7 @@ We have organized the tutorials into two sections:
 We've collected a core reference set of notebooks in this section outlining the features of Qiskit. We will be keeping them up to date with the latest Qiskit version.  
 - [Basics](qiskit/basics) is meant for those who are getting started.
 - [Terra](qiskit/terra) is meant for those who want to study circuits.
+- [Aer](qiskit/aer) is meant for those who want to simulate quantum circuits.
 - [Ignis](qiskit/ignis) is meant for those who want to study noise.
 - [Aqua](qiskit/aqua) is meant for those who want to develop applications on NISQ computers.
 - [Jupyter](qiskit/jupyter) is meant to highlight some cool Juypter features.

qiskit/aer/building_noise_models.ipynb

@@ -94,9 +94,9 @@
     "| `amplitude_damping_error` |  A single-qubit generalized amplitude damping error channel given by an amplitude damping parameter $\\lambda$, and an excited state thermal population $p_1$. |\n",
     "| `phase_damping_error` |  A single-qubit phase damping error channel given by a phase damping parameter $\\gamma$ |\n",
     "\n",
-    "### Combinging quantum errors\n",
+    "### Combining quantum errors\n",
     "\n",
-    "`QuantumError` instances can be combined to using composittion, tensor product, and tensor expansion (versed order tensor product) to produce new `QuantumErrors` as:\n",
+    "`QuantumError` instances can be combined by using composition, tensor product, and tensor expansion (reversed order tensor product) to produce new `QuantumErrors` as:\n",
     "\n",
     " * Composition: $\\cal{E}(\\rho)=\\cal{E_2}(\\cal{E_1}(\\rho))$ as `error = error1.compose(error2)`\n",
     " * Tensor product: $\\cal{E}(\\rho) =(\\cal{E_1}\\otimes\\cal{E_2})(\\rho)$ as `error error1.tensor(error2)`\n",