stoppign
Merge branch 'gh-pages' of github.com:Sirenity/blog into gh-pages

Conflicts:
	_posts/2014-03-5-A-Confession-that-was-long-overdue.md