adding final changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/Homepage.ejs
	views/californiaData.ejs
homepage

	views/Homepage.ejs
	views/californiaData.ejs
Adding final version of project
Adding final version