Merge branch 'master' of github.com:alexgorbatchev/SyntaxHighlighter-Site

Conflicts:
	layouts/default.haml

Author: alexgorbatchev

content/SyntaxHighlighter/adsense.txt

@@ -0,0 +1,24 @@
+---
+layout: nil
+filter:
+  - erb
+---
+<style>
+body {
+	margin : 0;
+	padding : 0;
+}
+</style>
+
+<script type="text/javascript"><!--
+google_ad_client = "ca-pub-2888483682038752";
+/* SyntaxHighlighter */
+google_ad_slot = "6566761887";
+google_ad_width = 160;
+google_ad_height = 600;
+//-->
+</script>
+<script type="text/javascript"
+src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
+