Merge pull request #32 from ainformatico/master

Yeah, Brackets is shitty with tabs, sorry. Added @ainformatico presentation about Marionette.js
drpicox · Mar 3, 2014 · 2e41157 · 2e41157
2 parents 16ea4f9 + ba64666
commit 2e41157
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/contents/2014.json b/contents/2014.json
@@ -44,7 +44,19 @@
 		]
 	},
 	{
-		"date": "2014-03-12T23:00:00.000Z",
+		"date": "2014-03-13T23:00:00.000Z",
+		"talks": [
+			{
+				"title": "Backbone, Martionette and other puppets",
+				"presenter": {
+					"username": "ainformatico",
+					"displayname": "Alejandro El Informático"
+				},
+				"description": "Now that you know Backbone.js is time to become a puppeteer and use Martionette.js, a composite application library for Backbone.js that aims to simplify the construction of large scale Javascript applications."
+			}
+		]
+	},
+	{
 		"talks": []
 	},
 	{