From 054cd075f0b2a9c2f36875b9b5988cdafacc0b4a Mon Sep 17 00:00:00 2001
From: brendandahl <brendan.dahl@gmail.com>
Date: Tue, 6 Nov 2012 10:25:30 -0800
Subject: [PATCH] Updated Style Guide (markdown)

---
 Style-Guide.md | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Style-Guide.md b/Style-Guide.md
index 7583d7d..0de3ae1 100644
--- a/Style-Guide.md
+++ b/Style-Guide.md
@@ -10,26 +10,22 @@
 * constants - ALL_UPPER_CASE_WITH_UNDERSCORES
 
 ## Braces
-* No braces for single line control statements
-
-```javascript
-if (someVar)
-  return true;
-```
-* Opening brace on the same line
+* Always use braces and put them on same line even for single line control statements
 
 ```javascript
 if (someVar) {
-  someVar += 2;
-  return someVar;
+  return true;
+} else {
+  return null;
 }
 ```
+_Note: This wasn't always followed, but any new code should do this._
 
 ## White Space
 * Space after control statements (if, else, while, for, ...)
 
 ```javascript
-if (someVar)
+if (someVar) {
 ```
 
 ## Classes