changed 1 and added a new one
Merge branch 'feature' into develop
Merge branch 'develop' of https://github.com/SoheilSaif/Test into develop

Conflicts:
	1.txt