deleted extraneous file created from merge
reverted screen.css.scss to original css, removed line from response.rb
edited duplicate handling, form table presentation for duplicates etc
added some conditionals to appearance of duplicate flag, removed before_update hash answers (already called from controller)