merged develop into master

removed temp files
Merge pull request #6 from NikolayShubenkovProgSchool/develop

merged develop into master