diff --git a/Darts/Darts/Form13.cs b/Darts/Darts/Form13.cs
diff --git a/Darts/Darts/Form13.resx b/Darts/Darts/Form13.resx
@@ -121,6 +121,6 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>26</value>
   </metadata>
 </root>
diff --git a/Darts/Darts/Form5.Designer.cs b/Darts/Darts/Form5.Designer.cs
diff --git a/Darts/Darts/obj/Debug/Darts.csproj.FileListAbsolute.txt b/Darts/Darts/obj/Debug/Darts.csproj.FileListAbsolute.txt
@@ -44,6 +44,7 @@ C:\Users\Stoilovi\Desktop\DARTS\Darts\Darts\obj\Debug\Darts.Form9.resources
 C:\Users\Stoilovi\Desktop\DARTS\Darts\Darts\obj\Debug\Darts.Form_StartUP.resources
 C:\Users\Stoilovi\Desktop\DARTS\Darts\Darts\obj\Debug\Darts.Properties.Resources.resources
 C:\Users\Stoilovi\Desktop\DARTS\Darts\Darts\obj\Debug\Darts.csproj.GenerateResource.Cache
+<<<<<<< HEAD
 C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Darts\bin\Debug\Darts.exe.config
 C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Darts\bin\Debug\Darts.exe
 C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Darts\bin\Debug\Darts.pdb
@@ -67,3 +68,28 @@ C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Darts\obj\D
 C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Darts\obj\Debug\Darts.csproj.GenerateResource.Cache
 C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Darts\obj\Debug\Darts.exe
 C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Darts\obj\Debug\Darts.pdb
+=======
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\bin\Debug\Darts.exe.config
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.exe
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.pdb
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\bin\Debug\Darts.exe
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\bin\Debug\Darts.pdb
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.csprojResolveAssemblyReference.cache
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form1.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form10.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form11.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form12.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form13.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form14.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form2.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form3.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form4.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form5.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form6.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form7.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form8.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form9.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Form_StartUP.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.Properties.Resources.resources
+C:\Users\Stoilovi\Desktop\Файлове\DARTS\Darts\Darts\obj\Debug\Darts.csproj.GenerateResource.Cache
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
diff --git a/Darts/Darts/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Darts/Darts/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Darts/Scoreboard/App.xaml b/Darts/Scoreboard/App.xaml
@@ -2,8 +2,9 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Scoreboard"
-             StartupUri="StartWindow.xaml">
+             StartupUri="MainWindow.xaml">
     <Application.Resources>
+<<<<<<< HEAD
         <ResourceDictionary>
             <Style x:Key="Golden" TargetType="Button">
                 <Setter Property="Background" Value="Gold" />
@@ -48,5 +49,8 @@
                 <Setter Property="HorizontalAlignment" Value="Center" />
             </Style>
         </ResourceDictionary>
+=======
+
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
     </Application.Resources>
 </Application>
diff --git a/Darts/Scoreboard/MainWindow.xaml b/Darts/Scoreboard/MainWindow.xaml
@@ -0,0 +1,15 @@
+<Window x:Class="Scoreboard.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Scoreboard"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="600" Width="800">
+    <Grid Name="mainGrid" Background="LightBlue">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+
+    </Grid>
+</Window>
diff --git a/Darts/Scoreboard/MainWindow.xaml.cs b/Darts/Scoreboard/MainWindow.xaml.cs
@@ -0,0 +1,31 @@
+using System;
+using Scoreboard;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Scoreboard
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void textBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/Darts/Scoreboard/Scoreboard.csproj b/Darts/Scoreboard/Scoreboard.csproj
@@ -55,26 +55,27 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="MainScoreBoard.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Compile Include="Giving_Name_Tournament.xaml.cs">
       <DependentUpon>Giving_Name_Tournament.xaml</DependentUpon>
     </Compile>
-    <Page Include="StartWindow.xaml">
+    <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+<<<<<<< HEAD
     <Compile Include="MainScoreBoard.xaml.cs">
       <DependentUpon>MainScoreBoard.xaml</DependentUpon>
     </Compile>
     <Compile Include="StartWindow.xaml.cs">
       <DependentUpon>StartWindow.xaml</DependentUpon>
+=======
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
       <SubType>Code</SubType>
     </Compile>
     <Page Include="Giving_Name_Tournament.xaml">

diff --git a/Darts/Scoreboard/StartWindow.xaml b/Darts/Scoreboard/StartWindow.xaml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <Window x:Class="Scoreboard.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -15,3 +16,47 @@
         </StackPanel>
     </Grid>
 </Window>
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD:Darts/Scoreboard/StartWindow.xaml
+<Window x:Class="Scoreboard.MainWindow"
+=======
+<Window x:Class="Scoreboard.MainWindow"
+>>>>>>> origin/master
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Scoreboard"
+        mc:Ignorable="d"
+        WindowStartupLocation="CenterScreen"
+        Title="MainWindow" Height="600" Width="800">
+    <Grid Background="LightGray">
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Button Style="{StaticResource Golden}" Click="Button_Click">Нова Игра</Button>
+            <Button Style="{StaticResource Golden}">Нов Турнир</Button>
+            <Button Style="{StaticResource Golden}">Ранглиста</Button>
+        </StackPanel>
+    </Grid>
+</Window>
+<<<<<<< HEAD
+=======
+<Window x:Class="Scoreboard.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Scoreboard"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="600" Width="800">
+    <Grid Name="mainGrid" Background="LightBlue">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+
+    </Grid>
+</Window>
+>>>>>>> origin/master:Darts/Scoreboard/MainWindow.xaml
+=======
+>>>>>>> origin/master
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
diff --git a/Darts/Scoreboard/StartWindow.xaml.cs~HEAD b/Darts/Scoreboard/StartWindow.xaml.cs~HEAD
@@ -0,0 +1,67 @@
+<<<<<<< HEAD:Darts/Scoreboard/StartWindow.xaml.cs
+using System;
+using Scoreboard;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Scoreboard
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            MainScoreBoard board = new MainScoreBoard();
+            board.Show();
+            this.Hide();
+        }
+    }
+}
+=======
+using System;
+using Scoreboard;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Scoreboard
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void textBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+
+        }
+    }
+}
+>>>>>>> origin/master:Darts/Scoreboard/MainWindow.xaml.cs
diff --git a/Darts/Scoreboard/obj/Debug/App.g.cs b/Darts/Scoreboard/obj/Debug/App.g.cs
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #pragma checksum "..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BB8B1DB265C16C39AAFA8D07863F27AA"
 //------------------------------------------------------------------------------
 // <auto-generated>
@@ -81,3 +82,75 @@ public partial class App : System.Windows.Application {
     }
 }
 
+=======
+#pragma checksum "..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E0A7A4E425FBCF9080B88E514C88CCD9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using Scoreboard;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace Scoreboard {
+
+
+    /// <summary>
+    /// App
+    /// </summary>
+    public partial class App : System.Windows.Application {
+
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+
+            #line 5 "..\..\App.xaml"
+            this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
+
+            #line default
+            #line hidden
+        }
+
+        /// <summary>
+        /// Application Entry Point.
+        /// </summary>
+        [System.STAThreadAttribute()]
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public static void Main() {
+            Scoreboard.App app = new Scoreboard.App();
+            app.InitializeComponent();
+            app.Run();
+        }
+    }
+}
+
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
diff --git a/Darts/Scoreboard/obj/Debug/App.g.i.cs b/Darts/Scoreboard/obj/Debug/App.g.i.cs
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #pragma checksum "..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "BB8B1DB265C16C39AAFA8D07863F27AA"
 //------------------------------------------------------------------------------
 // <auto-generated>
@@ -81,3 +82,75 @@ public partial class App : System.Windows.Application {
     }
 }
 
+=======
+#pragma checksum "..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "E0A7A4E425FBCF9080B88E514C88CCD9"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using Scoreboard;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace Scoreboard {
+
+
+    /// <summary>
+    /// App
+    /// </summary>
+    public partial class App : System.Windows.Application {
+
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+
+            #line 5 "..\..\App.xaml"
+            this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
+
+            #line default
+            #line hidden
+        }
+
+        /// <summary>
+        /// Application Entry Point.
+        /// </summary>
+        [System.STAThreadAttribute()]
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public static void Main() {
+            Scoreboard.App app = new Scoreboard.App();
+            app.InitializeComponent();
+            app.Run();
+        }
+    }
+}
+
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
diff --git a/Darts/Scoreboard/obj/Debug/MainWindow.g.i.cs b/Darts/Scoreboard/obj/Debug/MainWindow.g.i.cs
@@ -0,0 +1,106 @@
+#pragma checksum "..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "8B54F68132297C712F8B5C342297D848"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using Scoreboard;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace Scoreboard {
+
+
+    /// <summary>
+    /// MainWindow
+    /// </summary>
+    public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+
+
+        #line 9 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Grid mainGrid;
+
+        #line default
+        #line hidden
+
+
+        #line 13 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button button;
+
+        #line default
+        #line hidden
+
+        private bool _contentLoaded;
+
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/Scoreboard;component/mainwindow.xaml", System.UriKind.Relative);
+
+            #line 1 "..\..\MainWindow.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+
+            #line default
+            #line hidden
+        }
+
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.mainGrid = ((System.Windows.Controls.Grid)(target));
+            return;
+            case 2:
+            this.button = ((System.Windows.Controls.Button)(target));
+
+            #line 13 "..\..\MainWindow.xaml"
+            this.button.Click += new System.Windows.RoutedEventHandler(this.button_Click);
+
+            #line default
+            #line hidden
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+
diff --git a/Darts/Scoreboard/obj/Debug/Scoreboard.csproj.FileListAbsolute.txt b/Darts/Scoreboard/obj/Debug/Scoreboard.csproj.FileListAbsolute.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\MainWindow.g.cs
 C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Giving_Name_Tournament.g.cs
 C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\App.g.cs
@@ -35,3 +36,21 @@ C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Scoreboard\
 C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard.csproj.GenerateResource.Cache
 C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard.exe
 C:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard.pdb
+=======
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\MainWindow.g.cs
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Giving_Name_Tournament.g.cs
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\App.g.cs
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard_MarkupCompile.cache
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard_MarkupCompile.lref
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\bin\Debug\Scoreboard.exe.config
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard.csprojResolveAssemblyReference.cache
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\bin\Debug\Scoreboard.exe
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\bin\Debug\Scoreboard.pdb
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\MainWindow.baml
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Giving_Name_Tournament.baml
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard.g.resources
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard.Properties.Resources.resources
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard.csproj.GenerateResource.Cache
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard.exe
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\Scoreboard.pdb
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
diff --git a/Darts/Scoreboard/obj/Debug/Scoreboard_MarkupCompile.cache b/Darts/Scoreboard/obj/Debug/Scoreboard_MarkupCompile.cache
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Scoreboard
 
 
@@ -18,3 +19,25 @@ MainScoreBoard.xaml;StartWindow.xaml;Giving_Name_Tournament.xaml;
 
 False
 
+=======
+Scoreboard
+
+
+winexe
+C#
+.cs
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\
+Scoreboard
+none
+false
+DEBUG;TRACE
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\App.xaml
+21530306144
+
+6434522538
+13738642453
+MainWindow.xaml;Giving_Name_Tournament.xaml;
+
+False
+
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
diff --git a/Darts/Scoreboard/obj/Debug/Scoreboard_MarkupCompile.i.cache b/Darts/Scoreboard/obj/Debug/Scoreboard_MarkupCompile.i.cache
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Scoreboard
 
 
@@ -18,3 +19,25 @@ MainScoreBoard.xaml;StartWindow.xaml;Giving_Name_Tournament.xaml;
 
 True
 
+=======
+Scoreboard
+
+
+winexe
+C#
+.cs
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\obj\Debug\
+Scoreboard
+none
+false
+DEBUG;TRACE
+C:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\App.xaml
+21530306144
+
+10-1257647209
+13738642453
+MainWindow.xaml;Giving_Name_Tournament.xaml;
+
+False
+
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
diff --git a/Darts/Scoreboard/obj/Debug/Scoreboard_MarkupCompile.lref b/Darts/Scoreboard/obj/Debug/Scoreboard_MarkupCompile.lref
@@ -1,6 +1,14 @@
+<<<<<<< HEAD
 
 FC:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Scoreboard\App.xaml;;
 FC:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Scoreboard\MainScoreBoard.xaml;;
 FC:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Scoreboard\StartWindow.xaml;;
 FC:\Users\Ivo Gerginov\Documents\Projects\TuesDartsLeague\DARTS\Darts\Scoreboard\Giving_Name_Tournament.xaml;;
 
+=======
+
+
+FC:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\MainWindow.xaml;;
+FC:\Users\Stoilovi\Desktop\DARTS\Darts\Scoreboard\Giving_Name_Tournament.xaml;;
+
+>>>>>>> 4678ada3b674ce1102b5f884b3dcc57b7014bd12
diff --git a/Darts/UpgradeLog.htm b/Darts/UpgradeLog.htm