Salem's assignment
Merge pull request #21 from yessalem/master

Salem's assignment