diff --git a/app/assets/javascripts/job_approval.coffee b/app/assets/javascripts/job_approval.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/job_approval.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/job_approval.scss b/app/assets/stylesheets/job_approval.scss
new file mode 100644
index 0000000..602c474
--- /dev/null
+++ b/app/assets/stylesheets/job_approval.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Job_Approval controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/job_approval_controller.rb b/app/controllers/job_approval_controller.rb
new file mode 100644
index 0000000..93249de
--- /dev/null
+++ b/app/controllers/job_approval_controller.rb
@@ -0,0 +1,2 @@
+class JobApprovalController < ApplicationController
+end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
new file mode 100644
index 0000000..305689a
--- /dev/null
+++ b/app/controllers/welcome_controller.rb
@@ -0,0 +1,9 @@
+class WelcomeController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+
+  def index
+  end
+
+end
diff --git a/app/helpers/job_approval_helper.rb b/app/helpers/job_approval_helper.rb
new file mode 100644
index 0000000..379646d
--- /dev/null
+++ b/app/helpers/job_approval_helper.rb
@@ -0,0 +1,2 @@
+module JobApprovalHelper
+end
diff --git a/app/models/job_approval.rb b/app/models/job_approval.rb
new file mode 100644
index 0000000..b3664c0
--- /dev/null
+++ b/app/models/job_approval.rb
@@ -0,0 +1,2 @@
+class JobApproval < ActiveRecord::Base
+end
diff --git a/app/views/jobs/new.html.erb b/app/views/jobs/new.html.erb
index b5a457d..ae278a4 100644
--- a/app/views/jobs/new.html.erb
+++ b/app/views/jobs/new.html.erb
@@ -1,5 +1,6 @@
 <h1>New Job</h1>
-
+<b> Please fill in job details in the form below. </b>
 <%= render 'form' %>
 
-<%= link_to 'Back', jobs_path %>
+<%= link_to 'Back', jobs_path %> |
+<%= link_to 'Home', root_url %>
diff --git a/app/views/landing_page/home.html.erb b/app/views/landing_page/home.html.erb
index 4c95b50..2e7de01 100644
--- a/app/views/landing_page/home.html.erb
+++ b/app/views/landing_page/home.html.erb
@@ -1 +1,4 @@
-<h1>This is the home page</h1>
+<h1>This is the home page </h1>
+
+<h4>suppose when user first signed up, the will first see their profile (wireframe)</h4>
+<h4>then when user logged in (existing user), they will see home page (joblist page) </h4>
diff --git a/app/views/layouts/_menu.html.erb b/app/views/layouts/_menu.html.erb
index 8c54f3b..7690691 100644
--- a/app/views/layouts/_menu.html.erb
+++ b/app/views/layouts/_menu.html.erb
@@ -16,7 +16,8 @@
       <p class="navbar-text pull-right">
         <% if user_signed_in? %>
           Logged in as <strong><%= current_user.email %></strong>.
-          <%= link_to 'Edit profile', edit_user_registration_path, :class => 'navbar-link' %> |
+          <%= link_to 'Create Job', new_job_path, :class => 'navbar-link' %> |
+          <%= link_to 'Edit Profile', edit_user_registration_path, :class => 'navbar-link' %> |
           <%= link_to "Logout", destroy_user_session_path, method: :delete, :class => 'navbar-link'  %>
         <% else %>
           <%= link_to "Sign up", new_user_registration_path, :class => 'navbar-link'  %> |
diff --git a/db/migrate/20150728140053_create_job_approvals.rb b/db/migrate/20150728140053_create_job_approvals.rb
new file mode 100644
index 0000000..f7cd3ad
--- /dev/null
+++ b/db/migrate/20150728140053_create_job_approvals.rb
@@ -0,0 +1,11 @@
+class CreateJobApprovals < ActiveRecord::Migration
+  def change
+    create_table :job_approvals do |t|
+      t.integer :user_id
+      t.integer :job_id
+      t.string :status
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b4a1fd1..6083ba8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,16 +11,19 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20150728122551) do
-=======
-ActiveRecord::Schema.define(version: 20150728061128) do
->>>>>>> master
+ActiveRecord::Schema.define(version: 20150728140053) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-<<<<<<< HEAD
+  create_table "job_approvals", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "job_id"
+    t.string   "status"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "jobs", force: :cascade do |t|
     t.string   "title"
     t.string   "duration"
@@ -33,7 +36,6 @@
     t.datetime "updated_at",            null: false
   end
 
-=======
   create_table "users", force: :cascade do |t|
     t.string   "email",                  default: "", null: false
     t.string   "encrypted_password",     default: "", null: false
@@ -55,5 +57,4 @@
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
->>>>>>> master
 end
diff --git a/test/controllers/job_approval_controller_test.rb b/test/controllers/job_approval_controller_test.rb
new file mode 100644
index 0000000..602e244
--- /dev/null
+++ b/test/controllers/job_approval_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class JobApprovalControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/fixtures/job_approvals.yml b/test/fixtures/job_approvals.yml
new file mode 100644
index 0000000..316e1d1
--- /dev/null
+++ b/test/fixtures/job_approvals.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  user_id: 1
+  job_id: 1
+  status: MyString
+
+two:
+  user_id: 1
+  job_id: 1
+  status: MyString
diff --git a/test/models/job_approval_test.rb b/test/models/job_approval_test.rb
new file mode 100644
index 0000000..422eefe
--- /dev/null
+++ b/test/models/job_approval_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class JobApprovalTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end