Merge branch 'master' into dev

bmuenzenmeyer · bmuenzenmeyer · commit 123e55e13b28 · 2014-05-08T00:11:20.000-05:00
Conflicts:
	.travis.yml
	Gruntfile.js
	builder/patternlab.js
	package.json
	test/tests.html
diff --git a/.travis.yml b/.travis.yml
@@ -15,4 +15,4 @@ before_script:
 branches:
   only:
     - master
-    - dev
+    - dev
diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -1,5 +1,9 @@
 /* 
+<<<<<<< HEAD
  * patternlab-node - v0.1.1 - 2014-05-07 
+=======
+ * patternlab-node - v0.1.1 - 2014-05-05 
+>>>>>>> master
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 

-Original file line number
+Diff line change
 branches:
   only:
     - master
 -    - dev
 +    - dev