From 914a5ec991f67cb51faa1cfede685a2814c5408b Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <falcon@530912.no-reply.drupal.org>
Date: Fri, 8 Feb 2013 00:52:57 +0100
Subject: [PATCH] Merge conflick

---
 css/questionset.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/css/questionset.css b/css/questionset.css
index e85fba4..6336ca2 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -102,7 +102,8 @@
 }
 
 .questionset-results {
-  background: transparent url(img/Paper-clean.png);
+  background-image: url(img/Paper-clean.png);
+  background-color: rgba(255, 255, 255, 0.75);
 
   padding: 10px;
   height: 480px;