Lab6 commit
Merge branch 'gh-pages'