Added README info, added self to contributors, bumped version

Author: bpross

README.md

@@ -354,6 +354,7 @@ time.sleep(10)
 order_book.close()
 ```
 
+<<<<<<< HEAD
 ### Testing
 Unit tests are under development using the pytest framework. Contributions are 
 welcome!
@@ -370,6 +371,30 @@ python -m pytest
 - Major overhaul on how pagination is handled
 
 *1.0*
+=======
+### Error Handling
+Error handling has been added in version 2.0. Currently, the only HTTP error codes that
+are handled are the ones documented on the GDAX API error section: [here](https://docs.gdax.com/?python#errors)
+
+HTTP STATUS CODE 400: Raises InvalidGdaxRequest
+HTTP STATUS CODE 401: Raises UnauthorizedGdaxRequest
+HTTP STATUS CODE 403: Raises ForbiddenGdaxRequest
+HTTP STATUS CODE 404: Raises NotFoundGdaxRequest
+HTTP STATUS CODE 4XX: Raises UnknownGDAXClientRequest
+HTTP STATUS CODE 5XX: Raises InternalErrorGdaxRequest
+
+All HTTP requests from both the public client and authenticated client run through `_determine_response`, which
+either returns the JSON body or raises the appropriate error.
+
+Please consider creating new Exception classes and mapping as Gdax error states are discovered.
+
+
+## Change Log
+*2.0*
+- Added error handling to all HTTP requests [Error Handling Docs](#Error Handling)
+
+*1.0* **Current PyPI release**
+>>>>>>> Added README info, added self to contributors, bumped version
 - The first release that is not backwards compatible
 - Refactored to follow PEP 8 Standards
 - Improved Documentation

contributors.txt

@@ -3,4 +3,5 @@ Leonard Lin
 Jeff Gibson
 David Caseria
 Paul Mestemaker
-Drew Rice
+Drew Rice
+Benjamin Ross

setup.py

@@ -19,8 +19,13 @@
     long_description = fh.read()
 
 setup(
+<<<<<<< HEAD
     name='cbpro',
     version='1.1.4',
+=======
+    name='gdax',
+    version='2.0.0',
+>>>>>>> Added README info, added self to contributors, bumped version
     author='Daniel Paquin',
     author_email='[email protected]',
     license='MIT',