merging all conflicts

Author: iliakan

1-js/02-first-steps/16-function-expressions/article.md

@@ -82,7 +82,11 @@ let řekniAhoj = function() { // (1) vytvoření
   alert( "Ahoj" );
 };
 
+<<<<<<< HEAD
 let funkce = řekniAhoj;
+=======
+let func = sayHi;  //(2)
+>>>>>>> 6236eb8c3cdde729dab761a1d0967a88a1a6197e
 // ...
 ```
 

1-js/03-code-quality/06-polyfills/article.md

@@ -71,9 +71,7 @@ if (!Math.trunc) { // if no such function
 
 JavaScript is a highly dynamic language. Scripts may add/modify any function, even built-in ones.
 
-Two interesting polyfill libraries are:
-- [core js](https://github.com/zloirock/core-js) that supports a lot, allows to include only needed features.
-
+One interesting polyfill library is [core-js](https://github.com/zloirock/core-js), which supports a wide range of features and allows you to include only the ones you need.
 
 ## Summary
 

1-js/05-data-types/02-number/article.md

@@ -118,7 +118,7 @@ Common use cases for this are:
 ```warn header="Two dots to call a method"
 Please note that two dots in `123456..toString(36)` is not a typo. If we want to call a method directly on a number, like `toString` in the example above, then we need to place two dots `..` after it.
 
-If we placed a single dot: `123456.toString(36)`, then there would be an error, because JavaScript syntax implies the decimal part after the first dot. And if we place one more dot, then JavaScript knows that the decimal part is empty and now goes the method.
+If we placed a single dot: `123456.toString(36)`, then there would be an error, because JavaScript syntax implies the decimal part after the first dot. And if we place one more dot, then JavaScript knows that the decimal part is empty and now uses the method.
 
 Also could write `(123456).toString(36)`.
 

1-js/11-async/02-promise-basics/article.md

@@ -222,7 +222,7 @@ The idea of `finally` is to set up a handler for performing cleanup/finalizing a
 
 E.g. stopping loading indicators, closing no longer needed connections, etc.
 
-Think of it as a party finisher. No matter was a party good or bad, how many friends were in it, we still need (or at least should) do a cleanup after it.
+Think of it as a party finisher. Irresepective of whether a party was good or bad, how many friends were in it, we still need (or at least should) do a cleanup after it.
 
 The code may look like this: