Merge branch 'testing'

Conflicts:
	css/syntax.css

diff --cc css/default.css
Simple merge

diff --cc css/syntax.css
index 8b2d35d,f3d94c1..5f40e0c
--- 1/css/syntax.css
--- 2/css/syntax.css
+++ b/css/syntax.css
@@@ -19,6 -19,6 +19,6 @@@ pre.sourceCode span.fu { color: #06287e
  pre.sourceCode span.re { }
  pre.sourceCode span.er { color: red; font-weight: bold; }
  
 -pre.sourceCode {
 +pre {
-       background-color: #f7f7f9;
+       background-color: #f2f4f9;
  }