--- a/autotweet-php/composer.lock	Tue Sep 03 17:25:41 2013 +0900
+++ b/autotweet-php/composer.lock	Tue Sep 03 08:29:15 2013 +0000
@@ -3,7 +3,11 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
+<<<<<<< local
+    "hash": "8f885ddfce0f38da451325a21c07f232",
+=======
     "hash": "627a18a20db34e43dc89337d8f5728a8",
+>>>>>>> other
     "packages": [
         {
             "name": "doctrine/common",
@@ -378,6 +382,32 @@
             "time": "2013-04-26 18:42:52"
         },
         {
+            "name": "kertz/twitteroauth",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kertz/twitteroauth.git",
+                "reference": "88eb43ba510b120bf7791fe78d42a44332c1e0c0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kertz/twitteroauth/zipball/88eb43ba510b120bf7791fe78d42a44332c1e0c0",
+                "reference": "88eb43ba510b120bf7791fe78d42a44332c1e0c0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "twitteroauth"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "time": "2013-08-29 17:04:43"
+        },
+        {
             "name": "kriswallsmith/assetic",
             "version": "v1.1.2",
             "source": {
@@ -803,20 +833,21 @@
         },
         {
             "name": "symfony/icu",
-            "version": "v1.0.0",
+            "version": "v1.2.0",
             "target-dir": "Symfony/Component/Icu",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Icu.git",
-                "reference": "cac3fdfb111adbe590155f491594636d45129783"
+                "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Icu/zipball/cac3fdfb111adbe590155f491594636d45129783",
-                "reference": "cac3fdfb111adbe590155f491594636d45129783",
+                "url": "https://api.github.com/repos/symfony/Icu/zipball/7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
+                "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
                 "shasum": ""
             },
             "require": {
+                "lib-icu": ">=4.4",
                 "php": ">=5.3.3",
                 "symfony/intl": "~2.3"
             },
@@ -846,7 +877,7 @@
                 "icu",
                 "intl"
             ],
-            "time": "2013-06-03 18:32:07"
+            "time": "2013-06-03 18:32:58"
         },
         {
             "name": "symfony/monolog-bundle",
@@ -1859,7 +1890,11 @@
     ],
     "minimum-stability": "stable",
     "stability-flags": {
+<<<<<<< local
+        "kertz/twitteroauth": 20
+=======
         "zendframework/zendservice-twitter": 20
+>>>>>>> other
     },
     "platform": {
         "php": ">=5.3.3"

--- a/autotweet-php/src/Org/W3/AutotweetBundle/Controller/DefaultController.php	Tue Sep 03 17:25:41 2013 +0900
+++ b/autotweet-php/src/Org/W3/AutotweetBundle/Controller/DefaultController.php	Tue Sep 03 08:29:15 2013 +0000
@@ -16,6 +16,7 @@
     public function indexAction($name)
     {
         return array('name' => $name);
+	//$connection = new \W3TweetTwitterOAuth('hxg6thsXDcNByjBKwGtvdg', 'gJcfbddJPMydmvpaSP3qO283rI257ZtmlbghWjpmB28');
     }
     public function postAction(Request $request)
     {

--- a/autotweet-php/web/app_dev.php	Tue Sep 03 17:25:41 2013 +0900
+++ b/autotweet-php/web/app_dev.php	Tue Sep 03 08:29:15 2013 +0000
@@ -13,8 +13,8 @@
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
     || !in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1'))
 ) {
-    header('HTTP/1.0 403 Forbidden');
-    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
+//    header('HTTP/1.0 403 Forbidden');
+//    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
 }
 
 $loader = require_once __DIR__.'/../app/bootstrap.php.cache';