some changes
Merge branch 'master' of https://github.com/Alihamzehei/MDW-Group7