kei ahnig
Merge branch 'gh-pages' of https://github.com/mklarmann/equitable into gh-pages

Conflicts:
	_posts/stories/2014-03-06-soulkitchen.md
kai ahnig
Merge branch 'gh-pages' of https://github.com/mklarmann/equitable into gh-pages