resolved merge conflicts
Merge branch 'master' of https://github.com/Chebutroll/Valeriy_Burlaka_test_7web