diff --git a/Gemfile.lock b/Gemfile.lock
index da8b141..719def0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,10 +40,19 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
+    sass (3.4.24)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -66,5 +75,10 @@ DEPENDENCIES
   cucumber-sinatra
   haml
   pry
+  rspec
   rspec-expectations
+  sass
   sinatra
+
+BUNDLED WITH
+   1.14.6
diff --git a/features/logout.feature b/features/logout.feature
index 251c445..48dec52 100644
--- a/features/logout.feature
+++ b/features/logout.feature
@@ -1 +1,9 @@
-#Add your codez here
+Feature: Logout Page
+  In order to keep out the bad guys
+  As a user
+  I want to have to be able to log out and return to the home page
+
+  Scenario: Unauthenticated User
+    Given the dashboard page
+    When I click logout
+    Then I should see the logout page
diff --git a/features/step_definitions/login_steps.rb b/features/step_definitions/login_steps.rb
index 61f803a..2de7f85 100644
--- a/features/step_definitions/login_steps.rb
+++ b/features/step_definitions/login_steps.rb
@@ -1,14 +1,13 @@
 Given(/^the login page$/) do
-  #put your code here
-  pending
+  visit '/'
 end
 
 When(/^I log in with proper credentials$/) do
-  #put your code here
-  pending
+  fill_in 'username', with: 'a'
+  fill_in 'password', with: 'a'
+  click_button 'Login'
 end
 
 Then(/^I should see the secret page$/) do
-  #put your code here
-  pending
+  expect(page.current_path).to eq '/dashboard'
 end
diff --git a/features/step_definitions/logout_steps.rb b/features/step_definitions/logout_steps.rb
index 251c445..e8d48ba 100644
--- a/features/step_definitions/logout_steps.rb
+++ b/features/step_definitions/logout_steps.rb
@@ -1 +1,12 @@
-#Add your codez here
+Given(/^the dashboard page$/) do
+  visit '/'
+  step 'I log in with proper credentials'
+end
+
+When(/^I click logout$/) do
+  click_link 'Logout'
+end
+
+Then(/^I should see the logout page$/) do
+  expect(page.current_path).to eq '/logout'
+end