Initial commit
Merge branch 'master' of https://github.com/chenshifei/microblog

Conflicts:
	.gitignore