Updated name, removed norwegian characters

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

Oving 2/Oppg5/Oppg5.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.271
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Øving 2", "Øving 2\Øving 2.vcxproj", "{7846FDBB-329B-4890-A7F4-1868D36342FB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oppg5", "Oppg5\Oppg5.vcxproj", "{E31C569E-BC43-4B14-8514-116F432F27DF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,19 +13,19 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7846FDBB-329B-4890-A7F4-1868D36342FB}.Debug|x64.ActiveCfg = Debug|x64
+		{E31C569E-BC43-4B14-8514-116F432F27DF}.Debug|x64.ActiveCfg = Debug|x64
-		{7846FDBB-329B-4890-A7F4-1868D36342FB}.Debug|x64.Build.0 = Debug|x64
+		{E31C569E-BC43-4B14-8514-116F432F27DF}.Debug|x64.Build.0 = Debug|x64
-		{7846FDBB-329B-4890-A7F4-1868D36342FB}.Debug|x86.ActiveCfg = Debug|Win32
+		{E31C569E-BC43-4B14-8514-116F432F27DF}.Debug|x86.ActiveCfg = Debug|Win32
-		{7846FDBB-329B-4890-A7F4-1868D36342FB}.Debug|x86.Build.0 = Debug|Win32
+		{E31C569E-BC43-4B14-8514-116F432F27DF}.Debug|x86.Build.0 = Debug|Win32
-		{7846FDBB-329B-4890-A7F4-1868D36342FB}.Release|x64.ActiveCfg = Release|x64
+		{E31C569E-BC43-4B14-8514-116F432F27DF}.Release|x64.ActiveCfg = Release|x64
-		{7846FDBB-329B-4890-A7F4-1868D36342FB}.Release|x64.Build.0 = Release|x64
+		{E31C569E-BC43-4B14-8514-116F432F27DF}.Release|x64.Build.0 = Release|x64
-		{7846FDBB-329B-4890-A7F4-1868D36342FB}.Release|x86.ActiveCfg = Release|Win32
+		{E31C569E-BC43-4B14-8514-116F432F27DF}.Release|x86.ActiveCfg = Release|Win32
-		{7846FDBB-329B-4890-A7F4-1868D36342FB}.Release|x86.Build.0 = Release|Win32
+		{E31C569E-BC43-4B14-8514-116F432F27DF}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3E25C138-47B4-4BF9-BAAE-D9030FE6432F}
+		SolutionGuid = {0CD61EBC-FE68-4048-811D-31E82A6BEBA6}
 	EndGlobalSection
 EndGlobal

Oving 2/Oppg5/Oppg5/Oppg5.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -23,8 +23,8 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{b0d04901-1e2c-4441-ab9a-1d045eb8506a}</ProjectGuid>
+    <ProjectGuid>{e31c569e-bc43-4b14-8514-116f432f27df}</ProjectGuid>
-    <RootNamespace>Øving2_oppg4</RootNamespace>
+    <RootNamespace>Oppg5</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Oving 2/Oving2Oppg1to4/Oving2Oppg1to4.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.271
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oving2Oppg1to4", "Oving2Oppg1to4\Oving2Oppg1to4.vcxproj", "{A1357224-B406-4023-A892-AA8D6CF3C409}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A1357224-B406-4023-A892-AA8D6CF3C409}.Debug|x64.ActiveCfg = Debug|x64
+		{A1357224-B406-4023-A892-AA8D6CF3C409}.Debug|x64.Build.0 = Debug|x64
+		{A1357224-B406-4023-A892-AA8D6CF3C409}.Debug|x86.ActiveCfg = Debug|Win32
+		{A1357224-B406-4023-A892-AA8D6CF3C409}.Debug|x86.Build.0 = Debug|Win32
+		{A1357224-B406-4023-A892-AA8D6CF3C409}.Release|x64.ActiveCfg = Release|x64
+		{A1357224-B406-4023-A892-AA8D6CF3C409}.Release|x64.Build.0 = Release|x64
+		{A1357224-B406-4023-A892-AA8D6CF3C409}.Release|x86.ActiveCfg = Release|Win32
+		{A1357224-B406-4023-A892-AA8D6CF3C409}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8D537A7E-F206-4DF9-AAC9-BAB34073FA1F}
+	EndGlobalSection
+EndGlobal

Oving 2/Oving2Oppg1to4/Oving2Oppg1to4/Oving2Oppg1to4.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -20,8 +20,8 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{7846fdbb-329b-4890-a7f4-1868d36342fb}</ProjectGuid>
+    <ProjectGuid>{a1357224-b406-4023-a892-aa8d6cf3c409}</ProjectGuid>
-    <RootNamespace>Øving_2</RootNamespace>
+    <RootNamespace>Oving2Oppg1to4</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Oving 2/Oving2Oppg1to4/Oving2Oppg1to4/main.cpp

@@ -5,7 +5,8 @@
 
 void inputAndPrintInteger() {
 	cout << "Skriv inn et tall: ";
-	int input = 0; cin >> input;
+	int input = 0;
+	cin >> input;
 	cout << "Du skrev: " << input << "\n";
 }
 
@@ -160,7 +161,7 @@ bool menyFunc() {
 		SolveQuadradicEquation();
 		break;
 	default:
-		cout << "Tast inn et tall mellom 0 og 3. Prøv igjen.\n";
+		cout << "Tast inn et tall mellom 0 og 5. Prøv igjen.\n";
 		break;
 	}
 	return true;
@@ -221,9 +222,9 @@ int main() {
 #pragma region Oppgave 3 - Menysystem
 	// a
 
-	//while(menyFunc()){}
+	while (menyFunc()) {}
 
-	Gangetabell(14, 14);
+	//Gangetabell(14, 14);
 
 #pragma endregion
 

Øving 2/Øving2_oppg4/Øving2_oppg4.sln

@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.271
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Øving2_oppg4", "Øving2_oppg4\Øving2_oppg4.vcxproj", "{B0D04901-1E2C-4441-AB9A-1D045EB8506A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0D04901-1E2C-4441-AB9A-1D045EB8506A}.Debug|x64.ActiveCfg = Debug|x64
-		{B0D04901-1E2C-4441-AB9A-1D045EB8506A}.Debug|x64.Build.0 = Debug|x64
-		{B0D04901-1E2C-4441-AB9A-1D045EB8506A}.Debug|x86.ActiveCfg = Debug|Win32
-		{B0D04901-1E2C-4441-AB9A-1D045EB8506A}.Debug|x86.Build.0 = Debug|Win32
-		{B0D04901-1E2C-4441-AB9A-1D045EB8506A}.Release|x64.ActiveCfg = Release|x64
-		{B0D04901-1E2C-4441-AB9A-1D045EB8506A}.Release|x64.Build.0 = Release|x64
-		{B0D04901-1E2C-4441-AB9A-1D045EB8506A}.Release|x86.ActiveCfg = Release|Win32
-		{B0D04901-1E2C-4441-AB9A-1D045EB8506A}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E8FF668E-F3F6-43F7-B5FF-DA7CEF5BC2C1}
-	EndGlobalSection
-EndGlobal