lots of changes
Merge branch 'master' of https://www.github.com/j4rle/lab5
removed