Merge branch 'master' into gh-pages
Lab6.3
Merge branch 'gh-pages'