Merge conflicts.

Author: seth-mg

README.md

@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 [![Build Status](https://travis-ci.org/rosette-api/php.svg?branch=develop)](https://travis-ci.org/rosette-api/php)
 
->>>>>>> develop
 # PHP client binding for Rosette API #
 See the wiki for more information.
 
@@ -14,16 +11,6 @@ please check for its [**compatibilty with api.rosette.com**](https://developer.r
 If you have an on-premise version of Rosette API server, please contact support for
 binding compatibility with your installation.
 
-=======
-## Docker ##
-A Docker image for running the examples against the compiled source library is available on Docker Hub.
-
-Command: `docker run -e API_KEY=api-key -v "<binding root directory>:/source" rosetteapi/docker-php`
-
-Additional environment settings:
-`-e ALT_URL=<alternative URL>`
-`-e FILENAME=<single filename>`
-
 ## Basic Usage ##
 See [examples](examples)
 
@@ -35,3 +22,13 @@ See the [wiki](https://github.com/rosette-api/php/wiki/Release-Notes)
 
 ## Additional Information ##
 Visit [Rosette API site](https://developer.rosette.com)
+
+## Docker ##
+A Docker image for running the examples against the compiled source library is available on Docker Hub.
+
+Command: `docker run -e API_KEY=api-key -v "<binding root directory>:/source" rosetteapi/docker-php`
+
+Additional environment settings:
+ `-e ALT_URL=<alternative URL>`
+ `-e FILENAME=<single filename>`
+

composer.json

@@ -29,3 +29,4 @@
     }
   }
 }
+