styles_1
make stuff pretty
Merge branch 'master' into styles_1

Merging master to check conflicts with all the new styling.
update sign_in test
Merge branch 'master' into styles_1

fixed a test