Aligned form to make it look like a table
Merge branch 'master' of github.com:irrationl/cs146-uphone

*sigh*