Initial Version
Merge branch 'master' of https://github.com/maloveday/blog

Conflicts:
	.gitignore