diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
new file mode 100644
index 000000000..dd09ea984
--- /dev/null
+++ b/app/controllers/welcome_controller.rb
@@ -0,0 +1,6 @@
+class WelcomeController < ApplicationController
+  
+  def index
+  end
+
+end
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
new file mode 100644
index 000000000..c71238c69
--- /dev/null
+++ b/app/views/welcome/index.html.erb
@@ -0,0 +1 @@
+<h1>Bienvenido al Ayuntamiento de Madrid</h1>
diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb
new file mode 100644
index 000000000..0fa8b3255
--- /dev/null
+++ b/spec/features/home_spec.rb
@@ -0,0 +1,10 @@
+require 'rails_helper'
+
+feature "Home" do
+
+  scenario "Welcome message" do
+    visit '/'
+    expect(page).to have_content 'Bienvenido al Ayuntamiento de Madrid'
+  end
+
+end