fixed jekyll parsing error
Merge branch 'master' of git://github.com/urbit/urbit.github.io
More axes, etc.
Merge branch 'master' of github.com:urbit/urbit.github.io
Merge branch 'master' of git://github.com/urbit/urbit.github.io

Conflicts:
	_posts/doc/2013-11-18-urbit-is-easy-ch6.markdown