Merge branch 'dev'

dmolsen · dmolsen · commit 3a150a3a53d8 · 2015-03-07T10:01:36.000-05:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Twig PatternEngine for Pattern Lab PHP
+# Twig PatternEngine for Pattern Lab
 
 The Twig PatternEngine allows you to use [Twig](http://twig.sensiolabs.org) as the template language for Pattern Lab PHP. Once the PatternEngine is installed you can use Twig-based StarterKits and StyleguideKits.
 
diff --git a/composer.json b/composer.json
@@ -25,7 +25,8 @@
 	},
 	"require": {
 		"php":              ">=5.3.6",
-		"twig/twig":        "~1.15"
+		"twig/twig":        "~1.15",
+		"pattern-lab/core": "dev-dev"
 	},
 	"extra": {
 		"patternlab": {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Twig PatternEngine for Pattern Lab PHP`
	`1`	`+# Twig PatternEngine for Pattern Lab`
`2`	`2`
`3`	`3`	`The Twig PatternEngine allows you to use [Twig](http://twig.sensiolabs.org) as the template language for Pattern Lab PHP. Once the PatternEngine is installed you can use Twig-based StarterKits and StyleguideKits.`
`4`	`4`