Signed-off-by: unknown <christopher@christopher-PC.(none)>
sdg
Merge branch 'master' of git@github.com:suubersnake/CST_326_TeamAwesomeKiosk.git

Conflicts:
	AwesomeKiosk/AwesomeKiosk.suo
	AwesomeKiosk/AwesomeKiosk/App_Data/AppServerDB.sdf
nh
hgj
Merge branch 'master' of git@github.com:suubersnake/CST_326_TeamAwesomeKiosk.git

Conflicts:
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Debug/AwesomeKiosk.Tests.dll
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Debug/AwesomeKiosk.Tests.pdb
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Debug/AwesomeKiosk.dll
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Debug/AwesomeKiosk.pdb
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Debug/AwesomeKiosk_Accessor.dll
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Debug/AwesomeKiosk_Accessor.pdb
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Debug/AwesomeKiosk.Tests.csproj.FileListAbsolute.txt
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Debug/AwesomeKiosk.Tests.dll
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Debug/AwesomeKiosk.Tests.pdb
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Debug/AwesomeKiosk_Accessor.dll
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Debug/AwesomeKiosk_Accessor.pdb
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Debug/ResolveAssemblyReference.cache
	AwesomeKiosk/AwesomeKiosk.suo
	AwesomeKiosk/AwesomeKiosk/App_Data/AppServerDB.sdf
	AwesomeKiosk/AwesomeKiosk/bin/AwesomeKiosk.dll
	AwesomeKiosk/AwesomeKiosk/bin/AwesomeKiosk.pdb
	AwesomeKiosk/AwesomeKiosk/obj/Debug/AwesomeKiosk.dll
	AwesomeKiosk/AwesomeKiosk/obj/Debug/AwesomeKiosk.pdb
	AwesomeKiosk/AwesomeKiosk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	AwesomeKiosk/AwesomeKiosk/obj/Debug/ResolveAssemblyReference.cache
Merge branch 'master' of git@github.com:suubersnake/CST_326_TeamAwesomeKiosk.git
Signed-off-by: unknown <christopher@christopher-PC.(none)>
Signed-off-by: unknown <christopher@christopher-PC.(none)>
Signed-off-by: unknown <christopher@christopher-PC.(none)>
Merge branch 'master' of git@github.com:suubersnake/CST_326_TeamAwesomeKiosk.git

Conflicts:
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Release/AwesomeKiosk.Tests.dll
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Release/AwesomeKiosk.Tests.pdb
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Release/AwesomeKiosk_Accessor.dll
	AwesomeKiosk/AwesomeKiosk.Tests/bin/Release/AwesomeKiosk_Accessor.pdb
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Release/AwesomeKiosk.Tests.csproj.FileListAbsolute.txt
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Release/AwesomeKiosk.Tests.dll
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Release/AwesomeKiosk.Tests.pdb
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Release/AwesomeKiosk_Accessor.dll
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Release/AwesomeKiosk_Accessor.pdb
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Release/ResolveAssemblyReference.cache
	AwesomeKiosk/AwesomeKiosk.suo
	AwesomeKiosk/AwesomeKiosk/AwesomeKiosk.csproj
	AwesomeKiosk/AwesomeKiosk/obj/Release/DesignTimeResolveAssemblyReferences.cache
	AwesomeKiosk/AwesomeKiosk/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

Signed-off-by: unknown <christopher@christopher-PC.(none)>
Signed-off-by: unknown <christopher@christopher-PC.(none)>
Merge branch 'master' of git@github.com:suubersnake/CST_326_TeamAwesomeKiosk.git

Conflicts:
	AwesomeKiosk/AwesomeKiosk.Tests/obj/Release/AwesomeKiosk.Tests.csproj.FileListAbsolute.txt
	AwesomeKiosk/AwesomeKiosk/AwesomeKiosk.csproj
	AwesomeKiosk/AwesomeKiosk/obj/Release/AwesomeKiosk.csproj.FileListAbsolute.txt

Signed-off-by: unknown <christopher@christopher-PC.(none)>