syncing half-finished code whooo
Merge branch 'master' of github.com:irrationl/cs146-uphone

howboy
More work on signup
conflicts repaired