diff --git a/ZoFo/GameCore/Client.cs b/ZoFo/GameCore/Client.cs
index 4fe0116..c42dad7 100644
--- a/ZoFo/GameCore/Client.cs
+++ b/ZoFo/GameCore/Client.cs
@@ -27,12 +27,22 @@ namespace ZoFo.GameCore
 
         public void GameEndedUnexpectedly(){ }
 
-        public void JoinRoom(){ }
+        public void JoinRoom(string ip)
+        {
+            networkManager.JoinRoom(ip);
+        }
 
+<<<<<<< HEAD
         public void JoinYourself(){ networkManager.JoinYourself(); }
+=======
+        public void JoinYourself()
+        {
+            networkManager.JoinYourself();
+        }
+>>>>>>> 2e9fccd99a44f3e5ae11ac70f5e7282ec85d9f98
 
         internal void Update(GameTime gameTime)
-        { 
+        {
         }
 
         internal void Draw(SpriteBatch spriteBatch)