fixed some issues and merge conflict. added comments to improve code quality
added gitignore file
Merge pull request #1 from NikolayShubenkovProgSchool/Develop

иправления и замечания