Merge branch 'master' into dev

dmolsen · dmolsen · commit 6f5c78d0e5b2 · 2015-03-02T00:00:17.000-05:00
diff --git a/composer.json b/composer.json
@@ -24,8 +24,9 @@
 		}
 	},
 	"require": {
-		"php":            ">=5.3.6",
-		"twig/twig":      "~1.15"
+		"php":              ">=5.3.6",
+		"twig/twig":        "~1.15",
+		"pattern-lab/core": "~0.5"
 	},
 	"extra": {
 		"patternlab": {
