lab 2 v1
Merge branch 'master' of https://github.com/IntroHCI/website