Merging again

2014-07-18 19:33:42 -07:00
parent 21ec7bb82a
commit 65d4603093
6 changed files with 474 additions and 5 deletions
@@ -0,0 +1,31 @@
+---
+nola_2013.about:
+  languages: []
+  pages:
+  - /
+  data: []
+home.its_awesome:
+  languages: []
+  pages:
+  - /
+  data: []
+Conferences:
+  languages: []
+  pages:
+  - /
+  data: []
+Organizations:
+  languages: []
+  pages:
+  - /
+  data: []
+Resources:
+  languages: []
+  pages:
+  - /
+  data: []
+Sign_In:
+  languages: []
+  pages:
+  - /
+  data: []