changed text
added ignore
Removed _site from repo
Merge branch 'gh-pages' of github.com:biveeco/new_site into gh-pages

Conflicts:
	_site/arsham/index.html
	_site/assets/images/photos/service-advisory.jpg
	_site/index.html
	_site/jay/index.html
	_site/nicholas/index.html
	_site/scott/index.html