Add new classes
Merge remote-tracking branch 'origin/ChangeRole'

Conflicts:
	ComputerShop/ComputerShop/ComputerShop.csproj