fixes
Merge branch 'master' of https://github.com/BSU2013gr05/MihailovaED_labs
fixes
conflict resolve