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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
\ 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 @@
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
\ 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 @@
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1549987136740
-
-
- 1549987136740
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
\ 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 64f4abe..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# M2
-https://skillbox.ru/
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
\ 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 @@
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
\ 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 @@
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1549974917810
-
-
- 1549974917810
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
\ 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
new file mode 100644
index 0000000..6845c01
--- /dev/null
+++ b/demo-notes/module4/README.md
@@ -0,0 +1,5 @@
+
+Please use [Git Pro Book](https://git-scm.com/book/ru/v2/) for this module
+or use official [doc](https://git-scm.com/doc)
+
+Git is cool!