added gitignore
deleted _site files
ignoring .DS_Store files
Merge branch 'master' into gh-pages

Conflicts:
	_site/about.html
	_site/contact.html