deleted extraneous file created from merge
reverted screen.css.scss to original css, removed line from response.rb