a
Merge branch 'gh-pages' of github.com:WhiteWorld/blog

Conflicts:
	_posts/2014-06-13-rails4-cheat-sheet.md