changing 1.txt
chaning 2.txt
made changes in 3 and jess in develop
again in feature/new2
Merge branch 'feature/new2' into develop

Conflicts:
	3.txt