Adding files updated by Bassem
Merge pull request #96 from ndomar/componentTwo

Adding files updated by Bassem