final lab7
lab7 wired up
Merge branch 'master' of github.com:IntroHCI/website