merge conflict

diff --cc README.rst
index 43281e9,b2572fe..2a9208c
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -2,8 -2,8 +2,8 @@@ Requests: HTTP for Human
  =========================
  
  
- .. image:: https://secure.travis-ci.org/kennethreitz/requests.png?branch=master
-               :target: https://secure.travis-ci.org/kennethreitz/requests
+ .. image:: https://secure.travis-ci.org/kennethreitz/requests.png?branch=develop
 -              :target: https://secure.travis-ci.org/kennethreitz/requests
++        :target: https://secure.travis-ci.org/kennethreitz/requests
  
  Requests is an ISC Licensed HTTP library, written in Python, for human
  beings.