Merge pull request #123 from trilitech/staging

Update main from staging

src/components/Layout.jsx

@@ -326,15 +326,23 @@ const tutorialNavigation = [
         href: '/tutorials/build-your-first-app',
         children: [
           {
-            title: 'Wallets and user tokens',
+            title: "Introduction",
+            href: '/tutorials/build-your-first-app',
+          },
+          {
+            title: 'Part 1: Setting up the application',
+            href: '/tutorials/build-your-first-app/setting-up-app'
+          },
+          {
+            title: 'Part 2: Accessing wallets and tokens',
             href: '/tutorials/build-your-first-app/wallets-tokens',
           },
           {
-            title: 'Swapping tokens',
+            title: 'Part 3: Swapping tokens',
             href: '/tutorials/build-your-first-app/swapping-tokens',
           },
           {
-            title: 'Adding and removing liquidity',
+            title: 'Part 4: Adding and removing liquidity',
             href: '/tutorials/build-your-first-app/adding-removing-liquidity',
           },
         ],

src/pages/tezos-basics/tezos-blockchain-overview/index.md

@@ -27,7 +27,7 @@ Anyone who holds XTZ — the chain's native token — can propose changes to how
 
 ## Tezos uses proof of stake
 
-The proof-of-stake consensus model consensus model eliminates the need for high energy use, making it the "green" choice for blockchains. Instead of competing to achieve consensus as in proof-of-work models, Tezos nodes (called *bakers*) stake Tezos tokens to earn the right to create blocks and receive rewards. Users who want to participate without running a node themselves can delegate tokens to a baker for a share of the rewards. The bakers and delegators keep control of their tokens and can remove them at any time. Tezos's approach to consensus has been described as [Liquid Proof of Stake](https://medium.com/tezos/liquid-proof-of-stake-aec2f7ef1da7).
+The proof-of-stake consensus model eliminates the need for high energy use, making it the "green" choice for blockchains. Instead of competing to achieve consensus as in proof-of-work models, Tezos nodes (called *bakers*) stake Tezos tokens to earn the right to create blocks and receive rewards. Users who want to participate without running a node themselves can delegate tokens to a baker for a share of the rewards. The bakers and delegators keep control of their tokens and can remove them at any time. Tezos's approach to consensus has been described as [Liquid Proof of Stake](https://medium.com/tezos/liquid-proof-of-stake-aec2f7ef1da7).
 
 The proof-of-stake model improves scalability and encourages incentive alignment. It also increases the cost of 51% attacks and avoids environmentally wasteful proof-of-work. Tezos launched in June 2018 as one of the first major proof-of-stake networks.