Merge branch 'gh-pages'
lab6.4
Merge branch 'master' into gh-pages