Merge branch 'master' of github.com:uber/Python-Sample-Application into add-heroku-button

Conflicts:
	README.md

Author: friism

README.md

@@ -14,7 +14,7 @@ How To Use This
 
 1. Navigate over to https://developer.uber.com/, and sign up for an Uber developer account.
 2. Register a new Uber application and make your Redirect URI http://localhost:7000/submit - both OAuth scopes are required
-3. Fill in the relevant information in the config.json file in the root folder and add your client id and secret as the environment variables UBER_CLIENT_ID AND UBER_CLIENT_SECRET. Run ‘export UBER_CLIENT_ID=”YOUR_CLIENT_ID”&&export UBER_CLIENT_SECRET=”YOUR_CLIENT_SECRET”’
+3. Fill in the relevant information in the config.json file in the root folder and add your client id and secret as the environment variables UBER_CLIENT_ID AND UBER_CLIENT_SECRET. Run 'export UBER_CLIENT_ID="YOUR_CLIENT_ID"&&export UBER_CLIENT_SECRET="YOUR_CLIENT_SECRET"'
 4. Run ‘pip install -r requirements.txt’ to install dependencies
 5. Run ‘python app.py’
 6. Navigate to http://localhost:7000 in your browser

app.py

@@ -149,7 +149,7 @@ def time():
 
 @app.route('/price', methods=['GET'])
 def price():
-    """Example call to the time estimates endpoint.
+    """Example call to the price estimates endpoint.
 
     Returns the time estimates from the given lat/lng given below.
     """