Разрешение конфликтов между branch1 и branch2

Author: DrTECHNIC

README.md

@@ -1,5 +1,5 @@
 # Airbnb JavaScript Style Guide() {
-*Третьи изменения в этой ветке*
+*Мои изменения* *Ещё одни изменения* *Последние изменения*
 *A mostly reasonable approach to JavaScript*
 
 > **Note**: this guide assumes you are using [Babel](https://babeljs.io), and requires that you use [babel-preset-airbnb](https://npmjs.com/babel-preset-airbnb) or the equivalent. It also assumes you are installing shims/polyfills in your app, with [airbnb-browser-shims](https://npmjs.com/airbnb-browser-shims) or the equivalent.