4/4/14 Friday

Various
Merge branch 'gh-pages' of github.com:JimAllaire/catholicworker into gh-pages

Conflicts:
	_layouts/home.html
	_site/about/acknowledgements.html
	_site/about/archives.html
	_site/about/contact.html
	_site/about/index.html
	_site/about/terms.html
	_site/aims-and-means.html
	_site/blank-page.html
	_site/communities/volunteers.html
	_site/dorothyday/DDIconByTsai-sm.jpg
	_site/dorothyday/canonization.html
	_site/dorothyday/dd-biography.html
	_site/dorothyday/index.html
	_site/dorothyday/pspbrwse.jbf
	_site/faq.html
	_site/history.html
	_site/index.html
	_site/pages/cornell-history.html
	_site/pages/cw-aims-and-means.html
	_site/pages/eulogy-at-funeral.html
	_site/pages/forest-history.html
	_site/pages/hundred-forty-words.html
	_site/pages/memories-of-dd.html
	_site/pages/works-of-mercy.html
	_site/petermaurin/legacy.html
	_site/shops.html
4/4/14

Various