fix mac
Merge branch 'master' of github.com:hillscottc/hillscottc.github.io

Conflicts:
	index.html
newer index
more
trying add _site dir
add Gemfiles and locks?
trying
ok
ok
index
_site added to git ignore
site back
Merge branch 'gh-pages' of github.com:hillscottc/hillscottc.github.io into gh-pages

Conflicts:
	_config.yml
	_site/index.html
	programming_notes.md