Merge branch 'dev' of https://github.com/midnightspecial/patternlab-node into dev

bmuenzenmeyer · bmuenzenmeyer · commit c4f570275a74 · 2014-07-12T07:07:32.000-05:00
Conflicts:
	builder/object_factory.js
	builder/patternlab.js
diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -1,5 +1,9 @@
 /* 
+<<<<<<< HEAD
  * patternlab-node - v0.1.2 - 2014-07-12 
+=======
+ * patternlab-node - v0.1.2 - 2014-06-21 
+>>>>>>> 17680edf7cc53bd6c2eddb3051ec2b567cc603d6
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
