add ignore file
ignore
Conf
update function
Merge branch 'feature/1' into develop

Conflicts:
	Conf.txt