Copy over gh-pages config.
Merge branch 'master' into gh-pages
Merge branch 'shrink-mobile-post-listing-whitespace' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge conflict.
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Fix merge.
Merge branch 'master' into gh-pages
clean some stuff up
here's a post
Merge branch 'gh-pages'

Conflicts:
	_layouts/post.html