Merge remote-tracking branch 'origin/HeyDafna'

Conflicts:
	ComputerShop/ComputerShop/Credit.cs
Merge branch 'master2' of https://github.com/MonStar1/dot_net_c_sharp_project

Conflicts:
	ComputerShop/ComputerShop/CreditModel.cs
	ComputerShop/ComputerShop/UserModel.cs