Merging DC with Master

The DC branch includes:
1. Finalized version of google_places.py
2. Home page in which user is able to select types of location
3. Middle page (makeTour.html) in which user selects requested stops
4. Returns an array of addresses to be used in the final page of the app to generate the actual tour using the google maps API (Steve and Sweyn).

My branch is a functional version of pages 1 and 2 of the website, with the backend 100% integrated. Once this is merged, we will need to:
1. Add "select location" capability to home page, and integrate with app.py
2. Add "generate_tour" page which displays the actual tour.

Please merge as soon as possible. Once these have been merged I will continue to improve upon the middle page "makeTour" by giving the user more information about each stop, such as a picure and description.