merge snafu
merge snafu


Former-commit-id: 7966b575700c3a53d9e050fd2113b1614f1d6339 [formerly cd3bc186a9eb9918f886fe02fc183aac6f749467] [formerly 4333471bef42744d384067634aa41932b1aa71be] [formerly b8358c18217495321c458704966ac52d75edb225]
Former-commit-id: 4a22def49a4b6af3cff48214dc66fbe1ec9abbd8
Former-commit-id: 6b8ececed7bb45ed6c292fb92052f9cdf22b04e5
Former-commit-id: 33e96a6b02766bc3451a53c9442d3935fd3120a3
StanfordHCI/cs247,StanfordHCI/cs247,StanfordHCI/cs247