Merge pull request #40 from messagebird/add-conversations

Add conversations

Author: dysosmus

README.md

@@ -37,7 +37,6 @@ In case you are building without maven you still need maven to build the librari
 then simply copy the following jar's over to your project
 
 ```
-<<<<<<< HEAD
 messagebird-api-1.3.3.jar
 jackson-core-2.9.0.jar
 jackson-databind-2.1.1.jar