Merge branch 'master' of https://github.com/mfraser42/usability-study
Initial setup