Merge branch 'AddCargoFeature' into ChapterOneStory

Author: Codeliner

bin/behat

@@ -0,0 +1 @@
+../vendor/behat/behat/bin/behat

bin/selenium-server-standalone-2.37.0.jar

@@ -0,0 +1 @@
+../vendor/instaclick/php-webdriver/bin/webunit

bin/webunit

@@ -22,6 +22,14 @@
         "mwillbanks/zfc-twitter-bootstrap" : "dev-master"
     },
     "require-dev" : {
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "3.7.*",
+        "behat/behat": "2.4.*@stable",
+        "behat/mink": "1.4@stable",
+        "behat/mink-extension": "*",
+        "behat/mink-goutte-driver": "*",
+        "behat/mink-selenium2-driver": "*"
+    },
+    "config": {
+        "bin-dir": "bin/"
     }
 }