time for conflicts!
Merge branch 'master' of github.com:irrationl/cs146-uphone

Shawn and I accidentally changed about.js at the same time.