1
Merge branch 'master' of github.com:mahmoudrahat/test

Conflicts:
	test.txt