committing csproj file

get off my back
Merge branch 'master' of https://github.com/egreene/PracticeGDVP

Conflicts:
	CardShop/CardShop/CardShop.csproj
	CardShop/CardShop/CardShop.csproj.user
Merge branch 'master' of https://github.com/egreene/PracticeGDVP
Merge branch 'master' of https://github.com/egreene/PracticeGDVP
Fixing folder location invalidations.
Merge branch 'master' of https://github.com/egreene/PracticeGDVP

Conflicts:
	CardShop/CardShop/CardShop.csproj
Tried to fix the "partial view" problem with displaying the ReportViewer inside an MVC View.
Merge branch 'master' of https://github.com/egreene/PracticeGDVP

Conflicts:
	CardShop/CardShop/CardShop.csproj
	CardShop/CardShop/Views/Shared/_Layout.cshtml
Merge branch 'master' of https://github.com/egreene/PracticeGDVP

Conflicts:
	CardShop/CardShop/CardShop.csproj
Merge branch 'master' of https://github.com/egreene/PracticeGDVP
Merge branch 'master' of https://github.com/egreene/PracticeGDVP
Created Test class for the BaseballCardController class.
Merge branch 'master' of https://github.com/egreene/PracticeGDVP
Continued working on the test for the BaseballCardContrller class.
Merge branch 'master' of https://github.com/egreene/PracticeGDVP

Conflicts:
	CardShop/CardShop/Views/Shared/_Layout.cshtml
Added a Browse View to for the User.
Changed the "Browse" link on the front page to use the Index method instead of the Browse method which doesn't do anything yet other than redirecting the user.