editing
Merge branch 'source' of github.com:remotty/remotty.github.io into source

Conflicts:
	source/_posts/2013-12-09-how-to-make-a-new-post.md