Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
brought build items into Lab5 root directory