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

Conflicts:
	.gitignore
bla