Add blog
Merge branch 'master' of github.com:mjs2600/maryjane

Conflicts:
	source/blog/2013-08-31-chocolate.html.md