Auto
Merge branch 'gh-pages' of https://github.com/jliechty/Rational-Jesus into gh-pages

Conflicts:
	_posts/2014-10-17-marshill.markdown
	_site/2014/10/21/marshill/index.html
	_site/feed.xml
	_site/index.html