Merge branch 'dev'

dmolsen · dmolsen · commit a31dfd26c904 · 2016-05-18T23:24:35.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,5 @@
 .DS_Store
-composer.lock
-config/*
 export/*
-packages/*
 public/*
-source/*
+source/styleguide/*
 vendor/*
