faty change
Merge branch 'master' of https://github.com/khalidafla/GitTest.git

Conflicts:
	GitTest/src/com/exemple/gittest/Main.java