Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

Merge remote-tracking branch
'origin/master'

Conflicts:
	.gitignore

ll

ll
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/zhCHH/coreFactory

Conflicts:
	.gitignore