Resolve
Merge branch 'master' into moazBranch
Conflicts:
	README.md
Merge pull request #27 from yousraHazem/moazBranch

Resolve