start over
trying to build site
Merge branch 'gh-pages' of github.com:djfordz/christineford.org into gh-pages

Conflicts:
	.gitignore
	_site/feed.xml