Merge remote-tracking branch 'origin/python3.4' into python3.4

dmptrluke · dmptrluke · commit 7950e521998a · 2015-01-16T11:26:17.000+13:00
diff --git a/data/slaps.json b/data/slaps.json
@@ -20,6 +20,7 @@
          "cast iron skillet",
          "large trout",
          "baseball bat",
+         "cricket bat",
          "wooden cane",
          "nail",
          "printer",
