[FIX] fixed merge conflicts

Client/ViewModels/ViewModelGame.cs

@@ -1,4 +1,6 @@
+
 using Client.Views;
+using GalaSoft.MvvmLight.Command;
 using SharedClientServer;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -18,6 +20,26 @@ namespace Client.ViewModels
         private Point currentPoint = new Point();
         private Color color;
 
+        public ObservableCollection<string> Messages { get; } = new ObservableCollection<string>();
+
+        private dynamic _payload;
+
+        private string _username;
+
+        private string _message;
+        public string Message
+        {
+            get
+            {
+                return _message;
+            }
+            set
+            {
+                _message = value;
+            }
+        }
+        public ICommand OnKeyDown { get; set; }
+
         public void Canvas_MouseDown(MouseButtonEventArgs e, GameWindow window)
         {
             if (e.ButtonState == MouseButtonState.Pressed)
@@ -59,9 +81,46 @@ namespace Client.ViewModels
             colorSelected.B = window.ClrPcker_Background.SelectedColor.Value.B;
             color = colorSelected;
         }
+        
 
+        public ViewModelGame()
+        {
+            if (_payload == null)
+            {
+                _message = "";
 
+            }
+            else
+            {
+                //_message = data.Message;
+                //_username = data.User.Username;
+                //Messages.Add($"{data.User.Username}: {Message}");
+            }
+            OnKeyDown = new RelayCommand(ChatBox_KeyDown);
+        }
+
+        private void ChatBox_KeyDown()
+        {
+            //if enter then clear textbox and send message.
+            if (Message != string.Empty) AddMessage(Message);
+            Message = string.Empty;
+        }
+
+        internal void AddMessage(string message)
+        {
+            Messages.Add($"{data.User.Username}: {message}");
+
+            _payload = new
+            {
+                username = data.User.Username,
+                message = message
+            };
+
+            //Broadcast the message after adding it to the list!
+            data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE, _payload));
+        }
 
 
     }
 }
+