Added everything
Merge branch 'master' of github.com:b1nd/blog

Conflicts:
	.gitignore
Modified