hamad folder
Merge branch 'master' into faiz