added andy changes
merged with andy changess
Merge branch 'master' of github.com:jenhantao/saveSanDiego

Conflicts:
	SaveSanDiego/web/index.html