all in change
Merge branch 'master' of https://github.com/SoheilSaif/Test2

Conflicts:
	A1.txt