Merge branch 'master' of https://github.com/bloodrabbit/blog into bloodrabbit-master

Conflicts:
	source/layouts/layout.erb