Merge pull request #1 from Verchurro/Develop

Develop

.gitignore

@@ -1,4 +1,4 @@
-# Please put language-specific ignore patterns
-# in a .gitignore file inside the root folder
-# of that language. See Scala/.gitignore for
-# an example. Thanks.
+# Please put language-specific ignore patterns
+# in a .gitignore file inside the root folder
+# of that language. See Scala/.gitignore for
+# an example. Thanks.

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": "No Configurations"
+}

.vs/VSWorkspaceState.json

@@ -0,0 +1,10 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\C#",
+    "\\C#\\Trivia",
+    "\\C#\\Trivia\\Trivia"
+  ],
+  "SelectedNode": "\\C#\\Trivia\\Trivia\\Game.cs",
+  "PreviewInSolutionExplorer": false
+}

C#/.gitignore

@@ -1,7 +1,7 @@
-# MS Visual Studio
-*.suo
-*.csproj.user
-.vs/
-obj
-bin
+# MS Visual Studio
+*.suo
+*.csproj.user
+.vs/
+obj
+bin
 .idea

C#/Trivia/Trivia.sln.DotSettings

@@ -1,3 +1,3 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Method/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Method/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 </wpf:ResourceDictionary>

C#/Trivia/Trivia/.gitignore

@@ -1,2 +1,2 @@
-bin/
-obj/
+bin/
+obj/