Revert 5c11382..aba0634

This rolls back to commit 5c113827e27879b28fb5ab31e383de4d4f028eb4.
Revert aba0634..dc3afde

This rolls back to commit aba063490decffa5bdd5b34eac3363aa5c44fb15.
Removes conflict text from screen.css, commits to non-sass styling from here on out

This reverts commit ff432ce22a1d9aad84126dadef37001d53b94d51.