Completed client search
Merge branch 'master' of https://github.com/johnh8888/CS4400

Conflicts:
	Phase3/DataAccess.cs