[DEBUG] Still trying
Merge branch 'gh-pages'

Conflicts:
	_posts/2014-08-13-rules-notes-have-been-posted.md