resolve merge conflicts

Author: wogsland

CONTRIBUTING.md

@@ -0,0 +1,27 @@
+### Contributing to python-demandapi-client
+
+This is an InnerSource python project. It is the work of someone who thought it might benefit someone else in the company as well.
+
+### Maintainers
+
+This repository is maintained by
+
+1. [Ridley Larsen](@RidleyLarsen)
+
+## Contributing Code
+
+The best place to start is by looking at the [Samplify Integration board](https://app.asana.com/0/1143497512179452/board), which is for the initial build. If you decide to take on a task make sure to assign it to yourself so we don't duplicate work. A good PR completely resolves the associated Asana issue, passes or python linting, and includes test coverage for your new code. This Github repository is integrated with CircleCI, so a PR cannot be accepted that has merge conflicts, fails to pass linting or tests, or lowers the repository's test coverage. Additionally your PR should include a high level description of your or reviewers will be peppering you with questions, if this is something someone might have a question about in the future then go ahead and add this information to the [docs](docs). Approval of the maintainer is required merge a PR into `dev`, which is where all PRs go. 
+
+## Linting
+
+Linting software is strongly recommended to improve code quality and maintain readability in Python projects. Python's official linting package is called pycodestyle, but another useful linting package is called flake8. Flake8 runs three different linters on your code, including pycodestyle, and a package called PyFlakes that checks for things like unused imports.
+
+Read more [here](http://flake8.pycqa.org/en/latest/)
+
+## Testing
+
+## Filing Issues
+
+Please use the [GitHub Issues](https://github.com/researchnow/python-demandapi-client/issues/new) to file an issue.
+
+Thats it.

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Research Now
+Copyright (c) 2019 Dynata
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,5 @@
 # python-demandapi-client
-A Python client library for the Dynata Demand API
-
+A Python client library for the [Dynata Demand API](https://developers.dynata.com/)
 ## Setup
 
 The client requires environment variables to be set for the Dynata Demand API credentials. These can be found in `.env-example`.