conf
add ignore file
del Conf for ignore setting
add conf
Merge branch 'feature/1' into develop

Conflicts:
	Conf.txt
edit ignore
add 功能2
no message
Merge branch 'feature/2' into published

Conflicts:
	Conf.txt
	功能1.txt