merge places
merge places
Changes to Google_Place.py
Home Page Checklist
Changes to index and app.py to integrate home page with flask
Multiple checkboxes index capability
Home Page integratioion complete
progress on page2. Goal is to makeTour using user input from home. Page will return a list of addresses to be used for generating the final tour
progress on page2. Goal is to makeTour using user input from home. Page will return a list of addresses to be used for generating the final tour
working javascript on middle page
Making progress of javascript for location selection
Fully functional home page and middle page. Ready to integrate with master.
Fix one-line mis-indentation in google_directions.

Fix:
	py/google_directions.py
		-fix mis-aligned line in multi-line API URL variable; used hard
		instead of expanded tabs.
Merge branch 'DC'

Conflicts:
	app.py
	templates/index.html
Merge branch 'master' into DC

Conflicts:
	app.py
Local changes
Manual merge
Linked together components
Push first working tour
Real, working tours