From 61082602969ff9922b73c2464f2263c3f06ad430 Mon Sep 17 00:00:00 2001
From: Victor Zotov <sharikwriter@gmail.com>
Date: Mon, 8 Apr 2024 11:37:05 +0300
Subject: [PATCH 1/5] Edited README for git remote test

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 64f4abe..9cc1289 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
 # M2
 https://skillbox.ru/
+
+##This was added from linux

From 9c3afceb92bcbc6040d7521d5f10b0fe0106ce4e Mon Sep 17 00:00:00 2001
From: Victor Zotov <sharikwriter@gmail.com>
Date: Mon, 8 Apr 2024 15:08:49 +0300
Subject: [PATCH 2/5] Add link for module4 book

---
 demo-notes/module4/README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 demo-notes/module4/README.md

diff --git a/demo-notes/module4/README.md b/demo-notes/module4/README.md
new file mode 100644
index 0000000..f6f973f
--- /dev/null
+++ b/demo-notes/module4/README.md
@@ -0,0 +1,2 @@
+
+Please use [Git Pro Book](https://git-scm.com/book/ru/v2/) for this module

From 75e499441e3fbe265e65303c1abd8909a480f3b1 Mon Sep 17 00:00:00 2001
From: Victor Zotov <sharikwriter@gmail.com>
Date: Tue, 9 Apr 2024 09:14:05 +0300
Subject: [PATCH 3/5] add alternative link for module4

---
 Booleans/.idea/.gitignore                     |   2 -
 Booleans/.idea/.name                          |   1 -
 Booleans/.idea/compiler.xml                   |  22 ---
 .../.idea/copyright/profiles_settings.xml     |   3 -
 Booleans/.idea/encodings.xml                  |   4 -
 Booleans/.idea/misc.xml                       |  51 ------
 Booleans/.idea/modules.xml                    |   8 -
 Booleans/.idea/vcs.xml                        |   6 -
 Booleans/Booleans.iml                         |  11 --
 Booleans/src/Loader.java                      |  21 ---
 IncomeCalculator/.idea/encodings.xml          |   4 -
 IncomeCalculator/.idea/misc.xml               |   6 -
 IncomeCalculator/.idea/modules.xml            |   8 -
 IncomeCalculator/.idea/workspace.xml          | 147 ------------------
 IncomeCalculator/IncomeCalculator.iml         |  11 --
 IncomeCalculator/src/Main.java                |  75 ---------
 README.md                                     |   4 -
 RoadController/.idea/.gitignore               |   2 -
 RoadController/.idea/.name                    |   1 -
 RoadController/.idea/compiler.xml             |  22 ---
 .../.idea/copyright/profiles_settings.xml     |   3 -
 RoadController/.idea/encodings.xml            |   6 -
 RoadController/.idea/misc.xml                 |  44 ------
 RoadController/.idea/modules.xml              |   8 -
 RoadController/.idea/vcs.xml                  |   6 -
 RoadController/RoadController.iml             |  11 --
 RoadController/src/RoadController.java        |  93 -----------
 RoadController/src/core/Camera.java           |  20 ---
 RoadController/src/core/Car.java              |  18 ---
 WhileCycle/.idea/encodings.xml                |   4 -
 WhileCycle/.idea/misc.xml                     |   6 -
 WhileCycle/.idea/modules.xml                  |   8 -
 WhileCycle/.idea/workspace.xml                | 146 -----------------
 WhileCycle/WhileCycle.iml                     |  11 --
 WhileCycle/src/Main.java                      |  24 ---
 demo-notes/module1                            |   0
 demo-notes/module2                            |   0
 demo-notes/module3                            |   0
 demo-notes/module4/README.md                  |   1 +
 39 files changed, 1 insertion(+), 817 deletions(-)
 delete mode 100644 Booleans/.idea/.gitignore
 delete mode 100755 Booleans/.idea/.name
 delete mode 100755 Booleans/.idea/compiler.xml
 delete mode 100755 Booleans/.idea/copyright/profiles_settings.xml
 delete mode 100644 Booleans/.idea/encodings.xml
 delete mode 100755 Booleans/.idea/misc.xml
 delete mode 100755 Booleans/.idea/modules.xml
 delete mode 100755 Booleans/.idea/vcs.xml
 delete mode 100755 Booleans/Booleans.iml
 delete mode 100755 Booleans/src/Loader.java
 delete mode 100644 IncomeCalculator/.idea/encodings.xml
 delete mode 100644 IncomeCalculator/.idea/misc.xml
 delete mode 100644 IncomeCalculator/.idea/modules.xml
 delete mode 100644 IncomeCalculator/.idea/workspace.xml
 delete mode 100644 IncomeCalculator/IncomeCalculator.iml
 delete mode 100644 IncomeCalculator/src/Main.java
 delete mode 100644 README.md
 delete mode 100644 RoadController/.idea/.gitignore
 delete mode 100755 RoadController/.idea/.name
 delete mode 100755 RoadController/.idea/compiler.xml
 delete mode 100755 RoadController/.idea/copyright/profiles_settings.xml
 delete mode 100755 RoadController/.idea/encodings.xml
 delete mode 100755 RoadController/.idea/misc.xml
 delete mode 100755 RoadController/.idea/modules.xml
 delete mode 100755 RoadController/.idea/vcs.xml
 delete mode 100755 RoadController/RoadController.iml
 delete mode 100755 RoadController/src/RoadController.java
 delete mode 100755 RoadController/src/core/Camera.java
 delete mode 100755 RoadController/src/core/Car.java
 delete mode 100644 WhileCycle/.idea/encodings.xml
 delete mode 100644 WhileCycle/.idea/misc.xml
 delete mode 100644 WhileCycle/.idea/modules.xml
 delete mode 100644 WhileCycle/.idea/workspace.xml
 delete mode 100644 WhileCycle/WhileCycle.iml
 delete mode 100644 WhileCycle/src/Main.java
 create mode 100644 demo-notes/module1
 create mode 100644 demo-notes/module2
 create mode 100644 demo-notes/module3

diff --git a/Booleans/.idea/.gitignore b/Booleans/.idea/.gitignore
deleted file mode 100644
index 5c98b42..0000000
--- a/Booleans/.idea/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default ignored files
-/workspace.xml
\ No newline at end of file
diff --git a/Booleans/.idea/.name b/Booleans/.idea/.name
deleted file mode 100755
index 35d79ff..0000000
--- a/Booleans/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Booleans
\ No newline at end of file
diff --git a/Booleans/.idea/compiler.xml b/Booleans/.idea/compiler.xml
deleted file mode 100755
index 96cc43e..0000000
--- a/Booleans/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Booleans/.idea/copyright/profiles_settings.xml b/Booleans/.idea/copyright/profiles_settings.xml
deleted file mode 100755
index e7bedf3..0000000
--- a/Booleans/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/Booleans/.idea/encodings.xml b/Booleans/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/Booleans/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>
\ No newline at end of file
diff --git a/Booleans/.idea/misc.xml b/Booleans/.idea/misc.xml
deleted file mode 100755
index 32a1e06..0000000
--- a/Booleans/.idea/misc.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="Bundled (Maven 3)" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Booleans/.idea/modules.xml b/Booleans/.idea/modules.xml
deleted file mode 100755
index 792562a..0000000
--- a/Booleans/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Booleans.iml" filepath="$PROJECT_DIR$/Booleans.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Booleans/.idea/vcs.xml b/Booleans/.idea/vcs.xml
deleted file mode 100755
index 6c0b863..0000000
--- a/Booleans/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Booleans/Booleans.iml b/Booleans/Booleans.iml
deleted file mode 100755
index c90834f..0000000
--- a/Booleans/Booleans.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/Booleans/src/Loader.java b/Booleans/src/Loader.java
deleted file mode 100755
index 620c072..0000000
--- a/Booleans/src/Loader.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-public class Loader {
-
-  public static void main(String[] args) {
-    int milkAmount = 200; // ml
-    int powderAmount = 5; // g
-    int eggsCount = 3; // items
-    int sugarAmount = 5; // g
-    int oilAmount = 30; // ml
-    int appleCount = 8; // items
-
-    //powder - 400 g, sugar - 10 g, milk - 1 l, oil - 30 ml
-    System.out.println("Pancakes");
-
-    //milk - 300 ml, powder - 5 g, eggs - 5
-    System.out.println("Omelette");
-
-    //apples - 3, milk - 100 ml, powder - 300 g, eggs - 4
-    System.out.println("Apple pie");
-  }
-}
\ No newline at end of file
diff --git a/IncomeCalculator/.idea/encodings.xml b/IncomeCalculator/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/IncomeCalculator/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>
\ No newline at end of file
diff --git a/IncomeCalculator/.idea/misc.xml b/IncomeCalculator/.idea/misc.xml
deleted file mode 100644
index e0844bc..0000000
--- a/IncomeCalculator/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/IncomeCalculator/.idea/modules.xml b/IncomeCalculator/.idea/modules.xml
deleted file mode 100644
index a1c2ae5..0000000
--- a/IncomeCalculator/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/IncomeCalculator.iml" filepath="$PROJECT_DIR$/IncomeCalculator.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/IncomeCalculator/.idea/workspace.xml b/IncomeCalculator/.idea/workspace.xml
deleted file mode 100644
index 35d38d5..0000000
--- a/IncomeCalculator/.idea/workspace.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="1618631d-b76f-466b-ae74-f32886129052" name="Default Changelist" comment="" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/Main.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-60">
-              <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/Main.java" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
-    <option name="width" value="1440" />
-    <option name="height" value="877" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="IncomeCalculator" type="b2602c69:ProjectViewProjectNode" />
-              <item name="IncomeCalculator" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1549989230825" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Main" />
-      <module name="IncomeCalculator" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.Main" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="1618631d-b76f-466b-ae74-f32886129052" name="Default Changelist" comment="" />
-      <created>1549987136740</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1549987136740</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="877" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Image Layers" />
-      <window_info id="Designer" />
-      <window_info id="UI Designer" />
-      <window_info id="Capture Tool" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Terminal" weight="0.3299363" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3299363" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Palette" />
-      <window_info anchor="right" id="Theme Preview" />
-      <window_info anchor="right" id="Maven" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="right" id="Palette&#9;" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-60">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/IncomeCalculator/IncomeCalculator.iml b/IncomeCalculator/IncomeCalculator.iml
deleted file mode 100644
index c90834f..0000000
--- a/IncomeCalculator/IncomeCalculator.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/IncomeCalculator/src/Main.java b/IncomeCalculator/src/Main.java
deleted file mode 100644
index 47e4612..0000000
--- a/IncomeCalculator/src/Main.java
+++ /dev/null
@@ -1,75 +0,0 @@
-import java.util.Scanner;
-
-public class Main
-{
-    private static int minIncome = 200000;
-    private static int maxIncome = 900000;
-
-    private static int officeRentCharge = 140000;
-    private static int telephonyCharge = 12000;
-    private static int internetAccessCharge = 7200;
-
-    private static int assistantSalary = 45000;
-    private static int financeManagerSalary = 90000;
-
-    private static double mainTaxPercent = 0.24;
-    private static double managerPercent = 0.15;
-
-    private static double minInvestmentsAmount = 100000;
-
-    public static void main(String[] args)
-    {
-        while(true)
-        {
-            System.out.println("Введите сумму доходов компании за месяц " +
-                "(от 200 до 900 тысяч рублей): ");
-            int income = (new Scanner(System.in)).nextInt();
-
-            if(!checkIncomeRange(income)) {
-                continue;
-            }
-
-            double managerSalary = income * managerPercent;
-            double pureIncome = income - managerSalary -
-                calculateFixedCharges();
-            double taxAmount = mainTaxPercent * pureIncome;
-            double pureIncomeAfterTax = pureIncome - taxAmount;
-
-            boolean canMakeInvestments = pureIncomeAfterTax >=
-                minInvestmentsAmount;
-
-            System.out.println("Зарплата менеджера: " + managerSalary);
-            System.out.println("Общая сумма налогов: " +
-                (taxAmount > 0 ? taxAmount : 0));
-            System.out.println("Компания может инвестировать: " +
-                (canMakeInvestments ? "да" : "нет"));
-            if(pureIncome < 0) {
-                System.out.println("Бюджет в минусе! Нужно срочно зарабатывать!");
-            }
-        }
-    }
-
-    private static boolean checkIncomeRange(int income)
-    {
-        if(income < minIncome)
-        {
-            System.out.println("Доход меньше нижней границы");
-            return false;
-        }
-        if(income > maxIncome)
-        {
-            System.out.println("Доход выше верхней границы");
-            return false;
-        }
-        return true;
-    }
-
-    private static int calculateFixedCharges()
-    {
-        return officeRentCharge +
-                telephonyCharge +
-                internetAccessCharge +
-                assistantSalary +
-                financeManagerSalary;
-    }
-}
diff --git a/README.md b/README.md
deleted file mode 100644
index 9cc1289..0000000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# M2
-https://skillbox.ru/
-
-##This was added from linux
diff --git a/RoadController/.idea/.gitignore b/RoadController/.idea/.gitignore
deleted file mode 100644
index 5c98b42..0000000
--- a/RoadController/.idea/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default ignored files
-/workspace.xml
\ No newline at end of file
diff --git a/RoadController/.idea/.name b/RoadController/.idea/.name
deleted file mode 100755
index 008c92e..0000000
--- a/RoadController/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-RoadController
\ No newline at end of file
diff --git a/RoadController/.idea/compiler.xml b/RoadController/.idea/compiler.xml
deleted file mode 100755
index 96cc43e..0000000
--- a/RoadController/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/RoadController/.idea/copyright/profiles_settings.xml b/RoadController/.idea/copyright/profiles_settings.xml
deleted file mode 100755
index e7bedf3..0000000
--- a/RoadController/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/RoadController/.idea/encodings.xml b/RoadController/.idea/encodings.xml
deleted file mode 100755
index 97626ba..0000000
--- a/RoadController/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/RoadController/.idea/misc.xml b/RoadController/.idea/misc.xml
deleted file mode 100755
index 8524762..0000000
--- a/RoadController/.idea/misc.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11.0.4" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
\ No newline at end of file
diff --git a/RoadController/.idea/modules.xml b/RoadController/.idea/modules.xml
deleted file mode 100755
index 004d8ca..0000000
--- a/RoadController/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/RoadController.iml" filepath="$PROJECT_DIR$/RoadController.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/RoadController/.idea/vcs.xml b/RoadController/.idea/vcs.xml
deleted file mode 100755
index 6c0b863..0000000
--- a/RoadController/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/RoadController/RoadController.iml b/RoadController/RoadController.iml
deleted file mode 100755
index c90834f..0000000
--- a/RoadController/RoadController.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/RoadController/src/RoadController.java b/RoadController/src/RoadController.java
deleted file mode 100755
index b550204..0000000
--- a/RoadController/src/RoadController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-import core.*;
-import core.Camera;
-
-import java.util.Scanner;
-
-public class RoadController
-{
-    private static double passengerCarMaxWeight = 3500.0; // kg
-    private static int passengerCarMaxHeight = 2000; // mm
-    private static int controllerMaxHeight = 4000; // mm
-
-    private static int passengerCarPrice = 100; // RUB
-    private static int cargoCarPrice = 250; // RUB
-    private static int vehicleAdditionalPrice = 200; // RUB
-
-    public static void main(String[] args)
-    {
-        System.out.println("Сколько автомобилей сгенерировать?");
-
-        Scanner scanner = new Scanner(System.in);
-        int carsCount = scanner.nextInt();
-
-        for(int i = 0; i < carsCount; i++)
-        {
-            Car car = Camera.getNextCar();
-            System.out.println(car);
-
-            //Пропускаем автомобили спецтранспорта бесплатно
-            if (car.isSpecial) {
-                openWay();
-                continue;
-            }
-
-            //Проверяем высоту и массу автомобиля, вычисляем стоимость проезда
-            int price = calculatePrice(car);
-            if(price == -1) {
-                continue;
-            }
-
-            System.out.println("Общая сумма к оплате: " + price + " руб.");
-        }
-    }
-
-    /**
-     * Расчёт стоимости проезда исходя из массы и высоты
-     */
-    private static int calculatePrice(Car car)
-    {
-        int carHeight = car.height;
-        int price = 0;
-        if (carHeight > controllerMaxHeight)
-        {
-            blockWay("высота вашего ТС превышает высоту пропускного пункта!");
-            return -1;
-        }
-        else if (carHeight > passengerCarMaxHeight)
-        {
-            double weight = car.weight;
-            //Грузовой автомобиль
-            if (weight > passengerCarMaxWeight)
-            {
-                price = passengerCarPrice;
-                if (car.hasVehicle) {
-                    price = price + vehicleAdditionalPrice;
-                }
-            }
-            //Легковой автомобиль
-            else {
-                price = cargoCarPrice;
-            }
-        }
-        else {
-            price = passengerCarPrice;
-        }
-        return price;
-    }
-
-    /**
-     * Открытие шлагбаума
-     */
-    private static void openWay()
-    {
-        System.out.println("Шлагбаум открывается... Счастливого пути!");
-    }
-
-    /**
-     * Сообщение о невозможности проезда
-     */
-    private static void blockWay(String reason)
-    {
-        System.out.println("Проезд невозможен: " + reason);
-    }
-}
\ No newline at end of file
diff --git a/RoadController/src/core/Camera.java b/RoadController/src/core/Camera.java
deleted file mode 100755
index d6cd32d..0000000
--- a/RoadController/src/core/Camera.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package core;
-
-public class Camera
-{
-    public static Car getNextCar()
-    {
-        String randomNumber = Double.toString(Math.random()).substring(2, 5);
-        int randomHeight = (int) (1000 + 3500. * Math.random());
-        double randomWeight = 600 + 10000 * Math.random();
-
-        Car car = new Car();
-        car.number = randomNumber;
-        car.height = randomHeight;
-        car.weight = randomWeight;
-        car.hasVehicle = Math.random() > 0.5;
-        car.isSpecial = Math.random() < 0.15;
-
-        return car;
-    }
-}
\ No newline at end of file
diff --git a/RoadController/src/core/Car.java b/RoadController/src/core/Car.java
deleted file mode 100755
index 34f9cc4..0000000
--- a/RoadController/src/core/Car.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package core;
-
-public class Car
-{
-    public String number;
-    public int height;
-    public double weight;
-    public boolean hasVehicle;
-    public boolean isSpecial;
-
-    public String toString()
-    {
-        String special = isSpecial ? "СПЕЦТРАНСПОРТ " : "";
-        return "\n=========================================\n" +
-            special + "Автомобиль с номером " + number +
-            ":\n\tВысота: " + height + " мм\n\tМасса: " + weight + " кг";
-    }
-}
\ No newline at end of file
diff --git a/WhileCycle/.idea/encodings.xml b/WhileCycle/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/WhileCycle/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>
\ No newline at end of file
diff --git a/WhileCycle/.idea/misc.xml b/WhileCycle/.idea/misc.xml
deleted file mode 100644
index e0844bc..0000000
--- a/WhileCycle/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/WhileCycle/.idea/modules.xml b/WhileCycle/.idea/modules.xml
deleted file mode 100644
index 915107a..0000000
--- a/WhileCycle/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/WhileCycle.iml" filepath="$PROJECT_DIR$/WhileCycle.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/WhileCycle/.idea/workspace.xml b/WhileCycle/.idea/workspace.xml
deleted file mode 100644
index 418c9f2..0000000
--- a/WhileCycle/.idea/workspace.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="2f33d789-187b-4d9f-9785-a834cbf7644a" name="Default Changelist" comment="" />
-    <ignored path="$PROJECT_DIR$/out/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/Main.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="304">
-              <caret line="16" column="60" selection-start-line="16" selection-start-column="60" selection-end-line="16" selection-end-column="60" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/Main.java" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
-    <option name="width" value="1440" />
-    <option name="height" value="877" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="PackagesPane" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="WhileCycle" type="b2602c69:ProjectViewProjectNode" />
-              <item name="WhileCycle" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1549975041183" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Main" />
-      <module name="WhileCycle" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.Main" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="2f33d789-187b-4d9f-9785-a834cbf7644a" name="Default Changelist" comment="" />
-      <created>1549974917810</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1549974917810</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="877" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Image Layers" />
-      <window_info id="Designer" />
-      <window_info id="UI Designer" />
-      <window_info id="Capture Tool" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Palette" />
-      <window_info anchor="right" id="Theme Preview" />
-      <window_info anchor="right" id="Maven" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="right" id="Palette&#9;" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="16" column="60" selection-start-line="16" selection-start-column="60" selection-end-line="16" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/WhileCycle/WhileCycle.iml b/WhileCycle/WhileCycle.iml
deleted file mode 100644
index c90834f..0000000
--- a/WhileCycle/WhileCycle.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/WhileCycle/src/Main.java b/WhileCycle/src/Main.java
deleted file mode 100644
index de70536..0000000
--- a/WhileCycle/src/Main.java
+++ /dev/null
@@ -1,24 +0,0 @@
-import java.util.Scanner;
-
-public class Main
-{
-    public static void main(String[] args)
-    {
-        int secretPinCode = 7567;
-        int pinCode = -1;
-
-        Scanner scanner = new Scanner(System.in);
-        while(pinCode != secretPinCode)
-        {
-            if(pinCode == -1) {
-                System.out.println("Введите пароль:");
-            }
-            else {
-                System.out.println("Пароль введён неверно. Введите верный пароль:");
-            }
-            pinCode = scanner.nextInt();
-        }
-
-        System.out.println("Пароль введён верно!!!");
-    }
-}
diff --git a/demo-notes/module1 b/demo-notes/module1
new file mode 100644
index 0000000..e69de29
diff --git a/demo-notes/module2 b/demo-notes/module2
new file mode 100644
index 0000000..e69de29
diff --git a/demo-notes/module3 b/demo-notes/module3
new file mode 100644
index 0000000..e69de29
diff --git a/demo-notes/module4/README.md b/demo-notes/module4/README.md
index f6f973f..971cb2a 100644
--- a/demo-notes/module4/README.md
+++ b/demo-notes/module4/README.md
@@ -1,2 +1,3 @@
 
 Please use [Git Pro Book](https://git-scm.com/book/ru/v2/) for this module
+or use official [doc](https://git-scm.com/doc)

From 51ecba1afd60e13053ac5dd04087fcd1666abc9c Mon Sep 17 00:00:00 2001
From: Victor Zotov <sharikwriter@gmail.com>
Date: Tue, 9 Apr 2024 09:16:03 +0300
Subject: [PATCH 4/5] Updated README.md

---
 demo-notes/module4/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo-notes/module4/README.md b/demo-notes/module4/README.md
index f6f973f..eb3c5a3 100644
--- a/demo-notes/module4/README.md
+++ b/demo-notes/module4/README.md
@@ -1,2 +1,3 @@
 
 Please use [Git Pro Book](https://git-scm.com/book/ru/v2/) for this module
+it's enough

From c81ee27003b0a5625c3c07984138f825fb58c4dd Mon Sep 17 00:00:00 2001
From: Victor Zotov <sharikwriter@gmail.com>
Date: Tue, 9 Apr 2024 09:26:55 +0300
Subject: [PATCH 5/5] Updated README.md

---
 demo-notes/module4/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/demo-notes/module4/README.md b/demo-notes/module4/README.md
index eb3c5a3..caecad5 100644
--- a/demo-notes/module4/README.md
+++ b/demo-notes/module4/README.md
@@ -1,3 +1,5 @@
 
 Please use [Git Pro Book](https://git-scm.com/book/ru/v2/) for this module
 it's enough
+
+Git is cool!