Alireza: change of third feature
Alireza: Edit third feature.
Merge branch 'version2'
alireza: new edit of third feature
Merge branch 'master' of https://github.com/HospitalProject/team6