.
Merge branch 'master' of https://github.com/anewkirk-/NotFamousNuRetail

Conflicts:
	NuRetail_NotFamous/MainWindow.xaml
	NuRetail_NotFamous/bin/Debug/NuRetail_NotFamous.exe
	NuRetail_NotFamous/bin/Debug/NuRetail_NotFamous.pdb
	NuRetail_NotFamous/obj/Debug/MainWindow.g.i.cs
	NuRetail_NotFamous/obj/Debug/NuRetail_NotFamous.exe
	NuRetail_NotFamous/obj/Debug/NuRetail_NotFamous.pdb
.