Initial commit
start
init
init
init
ch
j
kl
jk
Merge branch 'jk-branch'

Conflicts:
	README.md
jlj
kl
jk
Merge branch 'master' into jk-branch

Conflicts:
	README.md
init
Merge branch 'master' into jk-branch
init
ok
Merge branch 'jk-branch' of github.com:taikongfeizhu/blog into jk-branch

Conflicts:
	README.md
	index.php