modify
Merge branch 'master' of github.com:shawnjust/TaxiFirmManagmentSystem_new

Conflicts:
	TaxiFirm/TaxiFirm/Models/DataClasses1.dbml
	TaxiFirm/TaxiFirm/Models/DataClasses1.designer.cs