diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1fba4ff..bd918d8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,7 @@
 class UsersController < ApplicationController
+  before_action :logged_in_user, only: [:edit, :update, :show]
+
+
   def new
   	@user = User.new
   end
@@ -18,10 +21,35 @@ class UsersController < ApplicationController
   	end
   end
 
+  def order
+    @user = User.find(params[:id])
+  end
+
+  def edit
+    @user = User.find(params[:id])
+  end
+
+  def update
+    @user = User.find(params[:id])
+    if @user.update_attributes(user_params)
+      redirect_to @user
+    else
+      render 'edit'
+    end
+  end
+
   private
 
     def user_params
       params.require(:user).permit(:name, :marks)
     end
 
+    # Confirms a logged-in user.
+    def logged_in_user
+      unless logged_in?
+        flash[:danger] = "Please log in."
+        redirect_to login_url
+      end
+    end
+
 end
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 0f7168d..44f46fb 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -15,7 +15,7 @@
             </a>
             <ul class="dropdown-menu">
               <li><%= link_to "Profile", current_user %></li>
-              <li><%= link_to "Settings", '#' %></li>
+              <li><%= link_to "Settings", edit_user_path(current_user) %></li>
               <li class="divider"></li>
               <li>
                 <%= link_to "Log out", logout_path, method: "delete" %>
diff --git a/app/views/static_pages/overview.html.erb b/app/views/static_pages/overview.html.erb
index d51fcba..d9450ae 100644
--- a/app/views/static_pages/overview.html.erb
+++ b/app/views/static_pages/overview.html.erb
@@ -23,4 +23,4 @@
             window.document.location = $(this).attr("href");
       });
   });
-  </script>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
new file mode 100644
index 0000000..56670ea
--- /dev/null
+++ b/app/views/users/edit.html.erb
@@ -0,0 +1,22 @@
+<% provide(:title, "Edit user") %>
+<h1>Update your profile</h1>
+
+<div class="row">
+  <div class="col-md-6 col-md-offset-3">
+    <%= form_for(@user) do |f| %>
+     
+
+      <%= f.label :name %>
+      <%= f.text_field :name, class: 'form-control' %>
+
+      <%= f.label :marks %>
+      <%= f.number_field :marks, class: 'form-control' %>
+
+     
+
+      <%= f.submit "Save changes", class: "btn btn-primary" %>
+    <% end %>
+
+    
+  </div>
+</div>
\ No newline at end of file