Merge branch 'master' of github.com:peterhellberg/coffeescript-cookbook.github.com

Conflicts:
	css/default.css

Author: peterhellberg

css/default.css

@@ -1,13 +1,13 @@
 /* Minimal reset */
 
 * {
-	vertical-align: baseline;
-	font-family: inherit;
-	font-style: inherit;
-	font-size: 100%;
-	border: none;
-	padding: 0;
-	margin: 0;
+  vertical-align: baseline;
+  font-family: inherit;
+  font-style: inherit;
+  font-size: 100%;
+  border: none;
+  padding: 0;
+  margin: 0;
 }
 
 /* Colors */