Merge branch 'master' of git@github.com:Neo-Desktop/Coleman-Code.git

COM380/Project5/GambleKit/CustomGameLogic/Pages/MainPage.cpp

@@ -10,7 +10,7 @@ MainPage::MainPage(CustomGame *game)
 	this->bet = 10;
 	this->lines = 5;
 	this->winning = 0;
-	this->credits = 100;
+	this->credits = 50;
 
 	// Add the background
 	this->AddEntity(new GkGameAnimation(game->AcquireAnimatedTexture(L"Background.png")));

COM380/Project5/GambleKit/GambleKit.vcxproj

@@ -27,7 +27,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">