haiku blog
Merge branch 'master' of github.com:XULRunner42/marty-nerdland

Conflicts:
	articles/haiku.markdown