Merge pull request #5 from Halim1989/master

from halim gmail
Merge pull request #6 from Halim1989/master

edit all files
gererating a conflict
try to generate a conflict
try to resolve conflict
test from success 2i
Merge pull request #7 from Halim1989/master

test
Merge branch 'master' of https://github.com/Successii/github_tuts
Merge pull request #8 from halim-success/master

commit from success2i
success2i rahou yetmeskhar
gmail rahou yetmeskhar