komanov pulled

Conflicts:
	README.md
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/Command.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/CreateCommand.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/DataBaseDir.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/DropCommand.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/MultiGetCommand.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/MultiListCommand.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/MultiPutCommand.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/MultiRemoveCommand.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/PackageGetter.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/ShowTablesCommand.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/MultiFileHashMap/UseCommand.java
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/filemap/DataBase.java
	src/ru/fizteh/fivt/students/dsalnikov/shell/Main.java
	src/ru/fizteh/fivt/students/moskupols/calculator/Calculator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/BinaryDivideOperator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/BinaryMinusOperator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/BinaryOperator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/BinaryPlusOperator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/BinaryProductOperator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/Operand.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/Operator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/ParenthesisCloseOperator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/UnaryMinusOperator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/UnaryOperator.java
	src/ru/fizteh/fivt/students/moskupols/calculator/lexemes/UnaryPlusOperator.java