first commit - with changes
Merge branch 'master' of https://github.com/ryanseville/Neighbourly-Companies

Conflicts:
	companylandr/css/style.css
	companylandr/images/team-1.jpg
	companylandr/images/team-2.jpg
	companylandr/images/team-3.jpg
	companylandr/images/team-4.jpg
	companylandr/index.html