first commit
Merge branch 'master' of https://github.com/ciratt/blog

Conflicts:
	.gitignore