my change
Merge branch 'dev' of https://github.com/nitzanlavi/Test into dev

Conflicts:
	Dev3.txt