merged
_site added to git ignore
site back
_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
_site added to git ignore
site back
Merge branch 'gh-pages' of github.com:hillscottc/hillscottc.github.io into gh-pages
trying