init
Merge branch 'master' of https://github.com/haluo/Nblog

Conflicts:
	.gitignore