posting final changes
Merge branch 'master' of https://github.com/NehaWani/CmpE272_Team22

Conflicts:
	README.md
	public/css/bootstrap-theme.css
	public/css/bootstrap-theme.min.css
	public/css/least.min.css
	public/css/least.scss
	public/css/prism.min.css
	public/css/style.css
	public/css/style.min.css
	public/css/style.scss
	public/img/1.jpg
	public/img/2.jpg
	public/img/3.jpg
	public/img/5.png
	public/img/end homeless.png
	public/img/infographics/LGBTYouth.png
	public/img/infographics/SupportuveHousing.png
	public/img/infographics/VictimizationEdited.png
	public/img/infographics/close.png
	public/img/infographics/costOfEndingHomelessness.jpg
	public/img/infographics/firstStepToSolveHomelessness.jpg
	public/img/infographics/homelessYouth.jpg
	public/img/infographics/homelessYouth1.jpg
	public/img/infographics/mythsOfHomelessness.png
	public/img/infographics/realCostOfhomelessness.jpg
	public/img/infographics/theHardestWarIsFoughtAtHome.png
	public/img/infographics/vietnam.png
	public/img/infographics/war.jpg
	public/img/infographics/white.gif
	public/img/seniors.jpg
	public/img/services/CrisisServices.jpg
	public/img/services/advocacyservices.jpg
	public/img/services/disabilityservices.jpg
	public/img/services/financialservices.jpg
	public/img/services/foodservices.jpg
	public/img/services/hotlineservices.jpg
	public/img/services/housingandshelter.png
	public/img/services/jobservices.jpg
	public/img/services/medicalservices.JPG
	public/img/services/seniorservices.jpg
	public/img/services/veteransservices.jpg
	public/img/services/youthservices.png
	public/img/thriftstore.jpg
	public/js/init.js
	public/js/jquery-1.6.1.min.js
	public/js/jquery.lazyload.min.js
	public/js/jquery.min.js
	public/js/least.js
	public/js/least.min.js
	public/js/myjQuery.js
	public/js/prism.js
	public/stylesheets/least.min.css
	public/stylesheets/least.scss
	public/stylesheets/prism.min.css
	public/stylesheets/style.css
	public/stylesheets/style.min.css
	public/stylesheets/style.scss
	routes/home.js
	routes/mysql.js
	views/Homepage.ejs
	views/californiaData.ejs
	views/index.html
	views/infographics.ejs
	views/nationalData.ejs
	views/stateData.ejs
	views/stateDataGraph.ejs