from halim gmail
Merge pull request #4 from halim-success/master

from halim success2i
from gmail
Merge pull request #5 from Halim1989/master

from halim gmail
edit all files
Merge pull request #6 from Halim1989/master

edit all files
try to resolve conflict