Initial commit
fix gitignore and merge branch 'master' of github.com:BlackKOT/Blog

Conflicts:
	.gitignore