Merge branch 'master' into alexei/kintsugi-docs

Author: alexeiZamyatin

docs/README.md

@@ -20,7 +20,11 @@ The life-cycle of interBTC follows the three main protocols:
 
 ### Radically Open & Secured by Insurance
 
+<<<<<<< HEAD
 What makes interBTC unique is the strict dedication to being trustless and decentralized.
+=======
+What makes interBTC unique is the strict dedication to being trustless and decentralized. Users
+>>>>>>> master
 
 - **Secured by Insurance**. Vaults lock collateral on the interBTC parachain in various digital assets - in a MakerDAO-inspired multi-collateral system. If Vaults misbehave, their collateral is slashed and users reimbursed. As a user, you only trust that Bitcoin and the DeFi platform you use are secure. 
 

docs/_sidebar.md

@@ -43,5 +43,4 @@
 
 * [Formal specification](https://spec.interlay.io/)
 
-
 * [Glossary](glossary/glossary.md)

docs/kintsugi/crowdloans.md

@@ -6,12 +6,17 @@ To participate in the crowdloan, you need to lock your KSM and vote for Kintsugi
 Below is a summary of the Kintsugi crowdloan details, as described in the [token economy whitepaper released by Kintsugi Labs](https://raw.githubusercontent.com/interlay/whitepapers/master/Kintsugi_Token_Economy.pdf).
 
 
+<<<<<<< HEAD
 ###  Hard Facts
+=======
+##  Hard Facts
+>>>>>>> master
 
 * **Target slot: 6 - 10**
 * **Lease duration: 8 periods (maximum lease duration ~48 weeks)**
 * **Max. lockup target: 200 000 KSM**
 
+<<<<<<< HEAD
 ### Crowdloan Airdrop: 12% 
 
 * **Main: 10% (1 million KINT)** of the initial 4-year KINT supply, with the following vesting schedule:
@@ -23,6 +28,16 @@ Below is a summary of the Kintsugi crowdloan details, as described in the [token
 
 
 The **main 10%** airdrop will feature the following **special allocations**, to create a proactive crowdloan process:
+=======
+#### Crowdloan Airdrop: 12%
+
+
+
+* **Crowdloan: 10% (1 million KINT)** of the initial 4-year KINT supply 
+* **Extra 2%** in-protocol airdrops for crowdloan participants who run Vaults and mint kBTC.
+
+To create a proactive crowdloan process, Kintsugi features the following **special airdrops:**
+>>>>>>> master
 
 
 
@@ -36,7 +51,11 @@ The **main 10%** airdrop will feature the following **special allocations**, to
 
 Any KINT not used for the Core, Early, Referral and Success Airdrop will be distributed proportionally among all participants, further increasing the ratio of KINT per locked KSM.
 
+<<<<<<< HEAD
 ### Participating in the Crowdloan 
+=======
+## Participating in the Crowdloan 
+>>>>>>> master
 
 The crowdloan is a fully permissionless event - you make your own judgement on if and how you would like to participate. 
 
@@ -46,5 +65,9 @@ We recommend the following ways to participate:
 2. Participate via partner exchanges.
 3. Participate via partner mobile wallets.
 
+<<<<<<< HEAD
 #### Guides
+=======
+### Guides
+>>>>>>> master
 Step-by-step guides incl. screenshots will be posted here shortly.