Merge branch 'master' into fix-tests

Author: nonhermitian

README.md

@@ -19,14 +19,13 @@ Please refer to this [installation guide](INSTALL.md) for setting up Qiskit and
 ## Contents
 
 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.
+- [Basics](qiskit/fundamentals) is meant for those who are getting started.
+- [Terra](qiskit/advanced/terra) is meant for those who want to study circuits.
+- [Aer](qiskit/advanced/aer) is meant for those who want to simulate quantum circuits.
+- [Ignis](qiskit/advanced/ignis) is meant for those who want to study noise.
+- [Aqua](qiskit/advanced/aqua) is meant for those who want to develop applications on NISQ computers.
 
-To go through the Qiskit examples, load up the [start_here.ipynb](qiskit/start_here.ipynb) notebook and start seeing how Qiskit works.
+To go through the Qiskit examples, load up the [start_here.ipynb](qiskit/1_start_here.ipynb) notebook and start seeing how Qiskit works.
 
 ## Contribution Guidelines
 
@@ -42,4 +41,4 @@ to the project at different levels. If you use Qiskit, please cite as per the in
 
 ## License
 
-[Apache License 2.0](LICENSE.txt)
+[Apache License 2.0](LICENSE)

qiskit/fundamentals/1_getting_started_with_qiskit.ipynb

@@ -86,7 +86,7 @@
     "$$|\\psi\\rangle = \\left(|000\\rangle+|111\\rangle\\right)/\\sqrt{2}.$$\n",
     "\n",
     "To create such a state, we start with a three-qubit quantum register. By default, each qubit in the register is initialized to $|0\\rangle$. To make the GHZ state, we apply the following gates:\n",
-    "* A Hadamard gate $H$ on qubit 0, which puts it into the superposition state $\\left(|0\\rangle+|1\\rangle\\right/\\sqrt{2}$.\n",
+    "* A Hadamard gate $H$ on qubit 0, which puts it into the superposition state $\\left(|0\\rangle+|1\\rangle\\right)/\\sqrt{2}$.\n",
     "* A controlled-Not operation ($C_{X}$) between qubit 0 and qubit 1.\n",
     "* A controlled-Not operation between qubit 0 and qubit 2.\n",
     "\n",