merge conflicts
merge conflicts


Former-commit-id: 849e5519591212b12e1d66036992bbcfe0df8d99
Former-commit-id: c02c5a54b8a5e46070b6040aca2b7fd834051dc7
Former-commit-id: c757c45b0ec9f76395f20f3be3bc65ac7fbb036f
StanfordHCI/cs247,StanfordHCI/cs247,StanfordHCI/cs247