Gilbert's edits on lab Beta
Merge branch 'master' of github.com:IntroHCI/website