Commit the blog
foo
Merge branch 'remotes'

Conflicts:
	.gitignore