Alireza: Third feature(search Engine)
Alireza: Third feature(Search Engine)
Merge branch 'master' of https://github.com/HospitalProject/team6 into version2

Conflicts:
	MasterPage.master.cs
ali - search
ali - conflict master
Merge branch 'version2'

Conflicts:
	MasterPage.master.cs
Merge branch 'master' of https://github.com/HospitalProject/team6