changes on 2 by jess in branNewFeature-Jessica
Merge branch 'develop' of https://github.com/SoheilSaif/Test into develop

Conflicts:
	2.txt