make changes in feature branch
Merge branch 'feature/add_new_file' into dev

Conflicts:
	test1.txt