kek
Merge branch 'master' of github.com:irrationl/cs146-uphone

Conflicts:
	js/about.js

Conflicts sure are annoying.