modified:   BNDN-Report/jsontests.txt
modified:   moofy/JsonServicesTests/UnitTest1.cs
Merge branch 'master' of github.com:Bladtman242/ITU.Year2.RentIt

Conflicts:
	moofy/JsonServicesTests/UnitTest1.cs

modified:   moofy/JsonServicesTests/JsonServicesTests.csproj
modified:   moofy/JsonServicesTests/UnitTest1.cs