update

Gemfile

@@ -22,7 +22,9 @@ gem 'turbolinks'
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0', group: :doc
+
 gem 'will_paginate'
+
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 

Gemfile.lock

@@ -37,15 +37,21 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
+<<<<<<< HEAD
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
+=======
+>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
     byebug (9.0.5)
+<<<<<<< HEAD
     coderay (1.1.1)
+=======
+>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
@@ -147,13 +153,19 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
+<<<<<<< HEAD
     will_paginate (3.1.0)
+=======
+>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
 
 PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+<<<<<<< HEAD
   better_errors
+=======
+>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
   byebug
   coffee-rails (~> 4.1.0)
   jbuilder (~> 2.0)
@@ -166,7 +178,10 @@ DEPENDENCIES
   tzinfo-data
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
+<<<<<<< HEAD
   will_paginate
+=======
+>>>>>>> 188b2973663c22c192a45c6e48947b0116f9069d
 
 BUNDLED WITH
    1.10.4

app/controllers/car_logs_controller.rb

 class CarLogsController < ApplicationController
 	def index
-		 @CarLogs = CarLog.all.paginate(:page => params[:page], :per_page => 8)
+		@CarLogs = CarLog.all.paginate(:page => params[:page], :per_page => 8)
 	end
 	
 	def deletestudent

app/controllers/pages_controller.rb

 class PagesController < ApplicationController
+
 	def index
 	end
+
 end

config/routes.rb

@@ -3,8 +3,12 @@ Rails.application.routes.draw do
   # See how all your routes lay out with "rake routes".
 
   # You can have the root of your site routed with "root"
+
   root 'pages#index'
   get 'carlogs' => 'car_logs#index'
+
+  # root 'welcome#index'
+
   # Example of regular route:
   #   get 'products/:id' => 'catalog#view'
 

db/migrate/20160705015151_create_car_logs.rb

 class CreateCarLogs < ActiveRecord::Migration
   def change
     create_table :car_logs do |t|
+
     	t.string :plate_number
     	t.string :brand
     	t.string :slot_number
     	t.boolean :is_taken
+
+
+
       t.timestamps null: false
     end
   end