diff --git a/client.js b/client.js
index ddcad6700d8057328905eeec2943e1618dc8d920..5ba96e09ef72ce3330fbeb1c145d17ac3d9ae2d3 100644
--- a/client.js
+++ b/client.js
@@ -5,5 +5,5 @@ window.onload = function() {
 	// code that is executed as the page is loaded.
 	// You shall put your own custom code here.
 	// window alert() is not allowed to be used in your implementation.
-	window.alert("Hello TDDD97!");
+	//window.alert("Hello TDDD97!");
 };
\ No newline at end of file
diff --git a/welcome.html b/welcome.html
new file mode 100644
index 0000000000000000000000000000000000000000..fad9070d71cb462899bd86fe0f71318c3b63aac7
--- /dev/null
+++ b/welcome.html
@@ -0,0 +1,48 @@
+<html>
+	<head>
+		<link href="client.css" type="text/css" rel="stylesheet">
+		<script src="client.js" type="text/javascript"></script>
+		<script src="serverstub.js" type="text/javascript"></script>
+	</head>
+	<body>
+        <img src="wimage.png" alt="logo and slogan">
+        <div style="background-color:cyan">
+            <form>
+                <label for="email">Email</label>
+                <input type="text" id="email" name="email"><br>
+                <label for="password">Password</label>
+                <input type="text" id="password" name="password"><br>
+            </form>
+        </div>
+        <div style="background-color:magenta">
+            <h2>Sign up here</h2>
+            <form>
+                <label for="fname">First name</label>
+                <input type="text" id="fname" name="fname"><br>
+                <label for="lname">Family name</label>
+                <input type="text" id="lname" name="lname"><br>
+                <!--
+                    Gender selection
+                -->
+                <label for="gender">Gender</label>
+                <select id="gender" name="gender">
+                    <option value="male">Male</option>
+                    <option value="female">Female</option>
+                    <option value="other">Other</option>
+                </select><br>
+                
+                <label for="city">City</label>
+                <input type="text" id="city" name="city"><br>
+                <label for="country">Country</label>
+                <input type="text" id="country" name="country"><br>
+                <label for="email">Email</label>
+                <input type="text" id="email" name="email"><br>
+                <label for="password">Password</label>
+                <input type="text" id="password" name="password"><br>
+                <label for="password2">Repeat PSW</label>
+                <input type="text" id="password2" name="password2"><br>
+                <input type="submit" value="Sign Up">
+            </form>
+        </div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/wimage.png b/wimage.png
new file mode 100644
index 0000000000000000000000000000000000000000..048bdd2fcf666069f57f0aab8521dc49f9914725
Binary files /dev/null and b/wimage.png differ