commit for merge
Merge branch 'master' of https://github.com/kcsmith4/CSE445_Assignment2

Conflicts:
	Distribute_Computing_Assignment2/PricingModel.cs
updates