Test Fork File.xml
Test Fork File pull.
Merge branch 'master' of git@github.com:islammenshawy/HelloGradle.git
Test commiting the fork file.
Test changing the file from master to 3.
Test changing the test file on fork to 4.
Test commiting the file only.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	testFile.xml
	
	Fixed the conflict.
Final commit from Fork, please approve this pull request.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	testFile.xml
	
	Fixed the merge conflict and checked into repository.
Merge pull request #2 from islammenshawy2/master

Fixed conflict on the file.