merge with upstream master

README.md

@@ -1,3 +1,6 @@
+[![CircleCI](https://circleci.com/gh/SunPower/Helix_Roof_Calculator.svg?style=svg&circle-token=aacf2ae59dae99075992ed10d1e27f119e223e75)](https://circleci.com/gh/SunPower/Helix_Roof_Calculator)
+
+
 ## Helix Calculator
 
 - [Staging](https://sp-helix-staging.herokuapp.com)
@@ -31,6 +34,22 @@
 | google-chrome-stable/stable,now 62.0.3202.94-1 amd64 |
 | nodejs/unknown,now 6.12.0-1nodesource1 amd64 |
 
+
+##### Environment Variables
+
+Set the environment variables for your specific environment. Use the `.env` file below as reference:
+
+```
+AWS_S3_BUCKET="..."
+AWS_ACCESS_KEY_ID="..."
+AWS_SECRET_ACCESS_KEY="..."
+
+SF_BASE_URL="https://test.salesforce.com"
+SFDC_ACCESS_KEY_ID="..."
+SFDC_SECRET_ACCESS_KEY="..."
+```
+
+
 ##### Set up for Develop and Testing
 
 - Run the docker container for the 1st time
@@ -47,7 +66,7 @@
 
 - Log in the docker container
 
-```docker exec -t -i helix /bin/bash```
+```docker exec -ti helix bash```
 
 - Run this commands inside the docker conatiner
 
@@ -367,3 +386,9 @@ docker exec -it helixroofcalculator_helix_1 invoke db_migrate
 ```
 
 Debugging is possible directly from PyCharm, all code changes are transparent between host and container.
+
+
+## Database schema
+
+
+![Database Schema](documentation/db_schema.png)