Updating Code
Merge branch 'master' of https://github.com/nzayatz14/BankingProject

Conflicts:
	Client.cpp
	Client.h
	Person.cpp