初始化
Merge branch 'origin/master'

Conflicts:
	.gitignore
..
Merge branch 'github-sunblog/master'