diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3f44eed96e8a88692bca50dbe2dbca792182a5bc
--- /dev/null
+++ b/app/controllers/trips_controller.rb
@@ -0,0 +1,24 @@
+class TripsController < ApplicationController
+	def show
+		@trip = Trip.find(params[:id])
+	end
+
+	def new
+		@trip = Trip.new
+		@lista_auto_user = Car.find_by("User_id = ?", session["warden.user.user.key"][0][0])
+		@cant_autos = @lista_auto_user.length
+	end 
+
+	def create
+
+		@trip = Trip.new(inicio: params[:trip][:inicio],
+						fin: params[:trip][:fin],
+						fecha_salida: params[:trip]["fecha_salida(1i)"]+"-"+params[:trip]["fecha_salida(2i)"]+"-"+params[:trip]["fecha_salida(3i)"],
+						hora_salida: params[:trip]["hora_salida(1i)"]+"-"+params[:trip]["hora_salida(2i)"]+"-"+params[:trip]["hora_salida(3i)"]+" "+params[:trip]["hora_salida(4i)"]+":"+params[:trip]["hora_salida(5i)"],
+						tam_equipaje: params[:trip][:tam_equipaje])
+		@trip.save
+		redirect_to users_path
+	end
+
+
+end
\ No newline at end of file
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..18a3d9194fdc9ce7db8e99414a339058d3e7de5c
--- /dev/null
+++ b/app/views/trips/_form.html.erb
@@ -0,0 +1,30 @@
+<%= form_for(@trip) do |f| %>
+	<%= f.label "Rutas" %><br/>
+		<div id="RUTAS">
+			<p><%= f.text_field :inicio, placeholder: "Ejemplo: Escuela Militar, Santiago" %></p>
+			<p><%= f.text_field :fin , placeholder: "Lugar de llegada" %></p>
+		</div>
+	<div>
+		<%= f.label "Fecha de salida" %><br />
+			<p><%= f.date_select :fecha_salida %></p>
+		<%= f.label "Hora de salida"%> <br/>
+			<p><%= f.time_select :hora_salida %></p>
+	</div>
+	<div>
+	<%= f.label "Tamaño del equipaje" %></br>
+	<p><%=f.select :tam_equipaje, options_for_select([["Grande", 1],["Mediano", 2],["Pequeño", 3]]) %> </p>
+	</div>
+	<div>
+	<!--<% if @cant_autos > 0 %>
+		<% @lista_auto_user.each do |auto| %>
+			<p><%= auto.marca %> <%= auto.modelo %> <%= auto.color %> </p>
+	<% else %>
+		<p>Ud. no tiene automoviles en el registro por favor inscriba <%= link_to "aqui", new_car_path %></p>
+	<%end%> -->
+
+	</div>
+
+	<div>
+		<%= f.submit "Guardar" %>
+	</div>
+<%end%>
\ No newline at end of file
diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..2be3d6291f72d37b8e16dfe678fc8f5fc5790399
--- /dev/null
+++ b/app/views/trips/new.html.erb
@@ -0,0 +1,3 @@
+<h1> Registra tu viaje </h1>
+<%= render "form" %>
+
diff --git a/log/development.log b/log/development.log
index 8266eb7e48161d61f3c365a68338fd274fcf9342..e3b7bf4eb4ada7a6383b591fe3ca72ef0bb6a44a 100644
--- a/log/development.log
+++ b/log/development.log
@@ -47208,6 +47208,87 @@ Started GET "/assets/welcome.self-877aef30ae1b040ab8a3aba4e3e309a11d7f2612f44dde
 Started GET "/assets/application.self-3b8dabdc891efe46b9a144b400ad69e37d7e5876bdc39dee783419a69d7ca819.js?body=1" for 127.0.0.1 at 2015-10-04 02:16:21 -0300
 
 
+<<<<<<< HEAD
+Started GET "/users" for 127.0.0.1 at 2015-10-04 02:20:25 -0300
+  ActiveRecord::SchemaMigration Load (0.5ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by UsersController#index as HTML
+  User Load (0.7ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["id", 1]]
+DEPRECATION WARNING: You are passing an instance of ActiveRecord::Base to `find`. Please pass the id of the object by calling `.id`. (called from index at /home/giercko/git/bd23-2015-1/app/controllers/users_controller.rb:21)
+  User Load (0.6ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 1]]
+  Rendered users/index.html.erb within layouts/user (12.5ms)
+Completed 200 OK in 1479ms (Views: 1319.0ms | ActiveRecord: 3.1ms)
+
+
+Started GET "/users" for 127.0.0.1 at 2015-10-04 02:20:33 -0300
+Processing by UsersController#index as HTML
+  User Load (0.4ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["id", 1]]
+DEPRECATION WARNING: You are passing an instance of ActiveRecord::Base to `find`. Please pass the id of the object by calling `.id`. (called from index at /home/giercko/git/bd23-2015-1/app/controllers/users_controller.rb:21)
+  User Load (0.3ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 1]]
+  Rendered users/index.html.erb within layouts/user (3.9ms)
+Completed 200 OK in 427ms (Views: 415.7ms | ActiveRecord: 0.7ms)
+
+
+Started GET "/cars/new" for 127.0.0.1 at 2015-10-04 02:21:11 -0300
+Processing by CarsController#new as HTML
+  Trademark Load (2.2ms)  SELECT  "trademarks".* FROM "trademarks"  ORDER BY "trademarks"."id" ASC LIMIT 1
+  Trademark Load (0.6ms)  SELECT "trademarks".* FROM "trademarks"
+  Model Load (0.8ms)  SELECT "models".* FROM "models" WHERE (trademark_id = 1)
+  Color Load (0.6ms)  SELECT "colors".* FROM "colors"
+  Rendered cars/new.html.erb within layouts/user (165.1ms)
+  User Load (0.4ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["id", 1]]
+Completed 200 OK in 603ms (Views: 503.9ms | ActiveRecord: 9.1ms)
+
+
+Started POST "/cars/new" for 127.0.0.1 at 2015-10-04 02:21:22 -0300
+Processing by CarsController#create as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"Ry4vTs6aZ89dcUz4mRCR63rbl82C5z/aotVp9TxuZuJD7F58qfZJohKE4EpW+hd1k0ttfBKU7xdDQa2G8mj+kQ==", "tri"=>{"trademark_id"=>"1"}, "car"=>{"Model_id"=>"1", "color"=>"#FFFF00", "asientos"=>"2", "comodidad"=>"3"}, "commit"=>"Enviar"}
+   (0.3ms)  begin transaction
+  SQL (1.0ms)  INSERT INTO "cars" ("User_id", "Model_id", "color", "asientos", "comodidad", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["User_id", 1], ["Model_id", 1], ["color", "#FFFF00"], ["asientos", 2], ["comodidad", 3], ["created_at", "2015-10-04 05:21:22.124950"], ["updated_at", "2015-10-04 05:21:22.124950"]]
+   (126.1ms)  commit transaction
+Redirected to http://localhost:3000/users
+Completed 302 Found in 146ms (ActiveRecord: 127.4ms)
+
+
+Started GET "/users" for 127.0.0.1 at 2015-10-04 02:21:22 -0300
+Processing by UsersController#index as HTML
+  User Load (0.5ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["id", 1]]
+DEPRECATION WARNING: You are passing an instance of ActiveRecord::Base to `find`. Please pass the id of the object by calling `.id`. (called from index at /home/giercko/git/bd23-2015-1/app/controllers/users_controller.rb:21)
+  User Load (0.4ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 1]]
+  Rendered users/index.html.erb within layouts/user (3.5ms)
+Completed 200 OK in 447ms (Views: 432.8ms | ActiveRecord: 0.9ms)
+  Car Load (11.6ms)  SELECT "cars".* FROM "cars"
+
+
+Started GET "/cars/new" for 127.0.0.1 at 2015-10-04 02:22:43 -0300
+Processing by CarsController#new as HTML
+  Trademark Load (1.0ms)  SELECT  "trademarks".* FROM "trademarks"  ORDER BY "trademarks"."id" ASC LIMIT 1
+  Trademark Load (0.5ms)  SELECT "trademarks".* FROM "trademarks"
+  Model Load (0.5ms)  SELECT "models".* FROM "models" WHERE (trademark_id = 1)
+  Color Load (0.5ms)  SELECT "colors".* FROM "colors"
+  Rendered cars/new.html.erb within layouts/user (24.9ms)
+  User Load (0.3ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["id", 1]]
+Completed 200 OK in 345ms (Views: 336.2ms | ActiveRecord: 2.8ms)
+
+
+Started POST "/cars/new" for 127.0.0.1 at 2015-10-04 02:22:50 -0300
+Processing by CarsController#create as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"sgnaWjhnlLogG+8SIbSb0k4HcgymrzG+YVLbTPbdc122y6toXwu612/uQ6DuXh1Mp5eIvTbc4XOAxh8/ONvrLg==", "tri"=>{"trademark_id"=>"1"}, "car"=>{"Model_id"=>"1", "color"=>"#FFFFFF", "asientos"=>"4", "comodidad"=>"4"}, "commit"=>"Enviar"}
+   (0.2ms)  begin transaction
+  SQL (0.9ms)  INSERT INTO "cars" ("User_id", "Model_id", "color", "asientos", "comodidad", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["User_id", 1], ["Model_id", 1], ["color", "#FFFFFF"], ["asientos", 4], ["comodidad", 4], ["created_at", "2015-10-04 05:22:50.954446"], ["updated_at", "2015-10-04 05:22:50.954446"]]
+   (125.5ms)  commit transaction
+Redirected to http://localhost:3000/users
+Completed 302 Found in 137ms (ActiveRecord: 126.7ms)
+
+
+Started GET "/users" for 127.0.0.1 at 2015-10-04 02:22:51 -0300
+Processing by UsersController#index as HTML
+  User Load (0.4ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ?  ORDER BY "users"."id" ASC LIMIT 1  [["id", 1]]
+DEPRECATION WARNING: You are passing an instance of ActiveRecord::Base to `find`. Please pass the id of the object by calling `.id`. (called from index at /home/giercko/git/bd23-2015-1/app/controllers/users_controller.rb:21)
+  User Load (0.3ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 1]]
+  Rendered users/index.html.erb within layouts/user (2.2ms)
+Completed 200 OK in 293ms (Views: 282.5ms | ActiveRecord: 0.7ms)
+  Car Load (1.1ms)  SELECT "cars".* FROM "cars"
+=======
 Started GET "/users/2/edit" for 127.0.0.1 at 2015-10-04 02:18:41 -0300
 Processing by UsersController#edit as HTML
   Parameters: {"id"=>"2"}
@@ -47764,6 +47845,7 @@ DEPRECATION WARNING: You are passing an instance of ActiveRecord::Base to `find`
   Rendered users/index.html.erb within layouts/user (0.7ms)
 Completed 200 OK in 68ms (Views: 65.3ms | ActiveRecord: 0.3ms)
   Car Load (0.3ms)  SELECT  "cars".* FROM "cars"  ORDER BY "cars"."id" DESC LIMIT 1
+<<<<<<< HEAD
 
 
 Started GET "/users/" for 127.0.0.1 at 2015-10-04 02:33:01 -0300
@@ -48206,3 +48288,6 @@ Processing by Devise::RegistrationsController#new as HTML
   Rendered devise/shared/_links.html.erb (0.8ms)
   Rendered devise/registrations/new.html.erb within layouts/application (3.5ms)
 Completed 200 OK in 89ms (Views: 88.6ms | ActiveRecord: 0.0ms)
+=======
+>>>>>>> 5a0c78392a1a631b07d0ace3b356bdda89b56ca9
+>>>>>>> 5089720df72f1a04121762e6a6d497a65dc364e9
diff --git a/tmp/cache/assets/development/sprockets/v3.0/0cwqjLvMvPMVZjTjpD7tf7PeDZvNpzh5xh48R1NjP4Q.cache b/tmp/cache/assets/development/sprockets/v3.0/0cwqjLvMvPMVZjTjpD7tf7PeDZvNpzh5xh48R1NjP4Q.cache
new file mode 100644
index 0000000000000000000000000000000000000000..2800ad3b2e2cbf3921f3032ad1306f4749f08af2
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/0cwqjLvMvPMVZjTjpD7tf7PeDZvNpzh5xh48R1NjP4Q.cache
@@ -0,0 +1 @@
+"%ã°ÄB˜üšûôÈ™o¹$'®Aäd›“L¤•™xR¸U
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/0e4N9mvRISsKWxwwI0gW3N3QyusQpKiO5dwXECYFJGw.cache b/tmp/cache/assets/development/sprockets/v3.0/0e4N9mvRISsKWxwwI0gW3N3QyusQpKiO5dwXECYFJGw.cache
new file mode 100644
index 0000000000000000000000000000000000000000..2800ad3b2e2cbf3921f3032ad1306f4749f08af2
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/0e4N9mvRISsKWxwwI0gW3N3QyusQpKiO5dwXECYFJGw.cache
@@ -0,0 +1 @@
+"%ã°ÄB˜üšûôÈ™o¹$'®Aäd›“L¤•™xR¸U
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/1D5ue68CxExNrKGh-bchquIkdA5l3AZfvoAnKtLWAas.cache b/tmp/cache/assets/development/sprockets/v3.0/1D5ue68CxExNrKGh-bchquIkdA5l3AZfvoAnKtLWAas.cache
new file mode 100644
index 0000000000000000000000000000000000000000..7f2916a65fcbf3975546e7e675f9a4a0f51a1d41
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/1D5ue68CxExNrKGh-bchquIkdA5l3AZfvoAnKtLWAas.cache
@@ -0,0 +1 @@
+"%Eøÿ2ÎRC¡1ú²h¢ÖV¹ÇC©uyíš÷LŽ
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/94M9c35NGVK_nkasZxvCsB6DYqB-ZC8y0URme9WHOJw.cache b/tmp/cache/assets/development/sprockets/v3.0/94M9c35NGVK_nkasZxvCsB6DYqB-ZC8y0URme9WHOJw.cache
new file mode 100644
index 0000000000000000000000000000000000000000..ab1a0556a26c88215b420f089ef1aa78bc4a1e86
Binary files /dev/null and b/tmp/cache/assets/development/sprockets/v3.0/94M9c35NGVK_nkasZxvCsB6DYqB-ZC8y0URme9WHOJw.cache differ
diff --git a/tmp/cache/assets/development/sprockets/v3.0/A7bIX0ywk19_AaUZcX_Zf6JMnQXmDzFwrMwYsb74QhA.cache b/tmp/cache/assets/development/sprockets/v3.0/A7bIX0ywk19_AaUZcX_Zf6JMnQXmDzFwrMwYsb74QhA.cache
new file mode 100644
index 0000000000000000000000000000000000000000..c0af7f59ff823474087311c7d6a13383aa5a3f56
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/A7bIX0ywk19_AaUZcX_Zf6JMnQXmDzFwrMwYsb74QhA.cache
@@ -0,0 +1 @@
+"%‰¶†ª³¾f‚û—TòŸ:¬D<{#sPW*(.Ç%
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/APY89OAPJx9A3D3xcCoktvEvQUs7NcWChYXnjjjPzz0.cache b/tmp/cache/assets/development/sprockets/v3.0/APY89OAPJx9A3D3xcCoktvEvQUs7NcWChYXnjjjPzz0.cache
index 39eabdc5028debaca759a10de366c16c09c265a2..026bd8cc366a42cd59ec835ebb6f7ffc54a06c94 100644
Binary files a/tmp/cache/assets/development/sprockets/v3.0/APY89OAPJx9A3D3xcCoktvEvQUs7NcWChYXnjjjPzz0.cache and b/tmp/cache/assets/development/sprockets/v3.0/APY89OAPJx9A3D3xcCoktvEvQUs7NcWChYXnjjjPzz0.cache differ
diff --git a/tmp/cache/assets/development/sprockets/v3.0/CpHuQwIFqH7YV8v1Rl_HZwbsZlsnFdgev9uqLiUcxG4.cache b/tmp/cache/assets/development/sprockets/v3.0/CpHuQwIFqH7YV8v1Rl_HZwbsZlsnFdgev9uqLiUcxG4.cache
new file mode 100644
index 0000000000000000000000000000000000000000..9c36a15a6b05fe87975daa2234702860b1fcb15d
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/CpHuQwIFqH7YV8v1Rl_HZwbsZlsnFdgev9uqLiUcxG4.cache
@@ -0,0 +1 @@
+"%£´²Qº+i¬ÕM@šíã\×ð‚}ANQØyTâ
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/E7342wpwhaTd_RfEfQ6lUaywk7HuNIxypuHC7tjBrSs.cache b/tmp/cache/assets/development/sprockets/v3.0/E7342wpwhaTd_RfEfQ6lUaywk7HuNIxypuHC7tjBrSs.cache
index 2ee7c0d569e160ff5829b85ac1aaf77b9ae390d0..c261eb27d9ccc54849560b498b7972c14013d89b 100644
Binary files a/tmp/cache/assets/development/sprockets/v3.0/E7342wpwhaTd_RfEfQ6lUaywk7HuNIxypuHC7tjBrSs.cache and b/tmp/cache/assets/development/sprockets/v3.0/E7342wpwhaTd_RfEfQ6lUaywk7HuNIxypuHC7tjBrSs.cache differ
diff --git a/tmp/cache/assets/development/sprockets/v3.0/FrfzjuZVp_66q4QBVHhNffuYfGxXxHaCCxhb18Pz3yA.cache b/tmp/cache/assets/development/sprockets/v3.0/FrfzjuZVp_66q4QBVHhNffuYfGxXxHaCCxhb18Pz3yA.cache
new file mode 100644
index 0000000000000000000000000000000000000000..c2bc81374b196068f97769cdee1e3720db32099a
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/FrfzjuZVp_66q4QBVHhNffuYfGxXxHaCCxhb18Pz3yA.cache
@@ -0,0 +1 @@
+I"“app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=4d283a217c8cf77ef9030e263b223384a636ac0de682371ba3a024e6b7343150:ET
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/GSz5XOy0ppo-Zr25M4z2gj9PkT2OZ__l50pUAoDCexI.cache b/tmp/cache/assets/development/sprockets/v3.0/GSz5XOy0ppo-Zr25M4z2gj9PkT2OZ__l50pUAoDCexI.cache
new file mode 100644
index 0000000000000000000000000000000000000000..c3cc6d4fe02b97691f6361b0cc61bd1c20d74161
Binary files /dev/null and b/tmp/cache/assets/development/sprockets/v3.0/GSz5XOy0ppo-Zr25M4z2gj9PkT2OZ__l50pUAoDCexI.cache differ
diff --git a/tmp/cache/assets/development/sprockets/v3.0/K596iaUffE1vhiWwRqWDCDcwFI2EJkJ3TFQUCJVBqyw.cache b/tmp/cache/assets/development/sprockets/v3.0/K596iaUffE1vhiWwRqWDCDcwFI2EJkJ3TFQUCJVBqyw.cache
new file mode 100644
index 0000000000000000000000000000000000000000..ff9124f98473a6c22545d2ba3dc13516eb86d718
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/K596iaUffE1vhiWwRqWDCDcwFI2EJkJ3TFQUCJVBqyw.cache
@@ -0,0 +1 @@
+"%ÜDùš¶ #+ÌàR=¶Íý–ìÏÕï@7‘˜ì|(
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/KhKOjnOJ8zfySqV9Kg_xb-Hy_QPTexIUPDxoRJRbxNI.cache b/tmp/cache/assets/development/sprockets/v3.0/KhKOjnOJ8zfySqV9Kg_xb-Hy_QPTexIUPDxoRJRbxNI.cache
new file mode 100644
index 0000000000000000000000000000000000000000..daa4a0d0736922f277b0a42bba9e3b736e6930e8
Binary files /dev/null and b/tmp/cache/assets/development/sprockets/v3.0/KhKOjnOJ8zfySqV9Kg_xb-Hy_QPTexIUPDxoRJRbxNI.cache differ
diff --git a/tmp/cache/assets/development/sprockets/v3.0/L4QdID0LEgKERjq76byqFybNuaBCdwH5PS8XO0amxmU.cache b/tmp/cache/assets/development/sprockets/v3.0/L4QdID0LEgKERjq76byqFybNuaBCdwH5PS8XO0amxmU.cache
new file mode 100644
index 0000000000000000000000000000000000000000..94d07666d5f35472ce33ec6c32b053d1dc159365
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/L4QdID0LEgKERjq76byqFybNuaBCdwH5PS8XO0amxmU.cache
@@ -0,0 +1 @@
+"%÷” w±D 0+ „§B˜ð¼&,fto.Ï8M±”Zf
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/PX3LwJFfut5LCMtXnLNJONBMyV6VXcsgdqiiHx0JcZM.cache b/tmp/cache/assets/development/sprockets/v3.0/PX3LwJFfut5LCMtXnLNJONBMyV6VXcsgdqiiHx0JcZM.cache
new file mode 100644
index 0000000000000000000000000000000000000000..ff9124f98473a6c22545d2ba3dc13516eb86d718
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/PX3LwJFfut5LCMtXnLNJONBMyV6VXcsgdqiiHx0JcZM.cache
@@ -0,0 +1 @@
+"%ÜDùš¶ #+ÌàR=¶Íý–ìÏÕï@7‘˜ì|(
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/SSWV11sceb7qUyel59Rn-f2d0uDbz1i0gIQvMFBWlww.cache b/tmp/cache/assets/development/sprockets/v3.0/SSWV11sceb7qUyel59Rn-f2d0uDbz1i0gIQvMFBWlww.cache
new file mode 100644
index 0000000000000000000000000000000000000000..2dee79f9d00d1ea55cc42317c3ceb24768cd80dd
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/SSWV11sceb7qUyel59Rn-f2d0uDbz1i0gIQvMFBWlww.cache
@@ -0,0 +1 @@
+"%É>V¿¶ƒ‰µÞÏ϶!†;=H„•ø)XØ4R%þÄ
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/VEaWFUP09o9eg-pEbBXJYT-r8Cr5PGHYBO5mlOInEnc.cache b/tmp/cache/assets/development/sprockets/v3.0/VEaWFUP09o9eg-pEbBXJYT-r8Cr5PGHYBO5mlOInEnc.cache
new file mode 100644
index 0000000000000000000000000000000000000000..ff9124f98473a6c22545d2ba3dc13516eb86d718
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/VEaWFUP09o9eg-pEbBXJYT-r8Cr5PGHYBO5mlOInEnc.cache
@@ -0,0 +1 @@
+"%ÜDùš¶ #+ÌàR=¶Íý–ìÏÕï@7‘˜ì|(
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/XcTZIddMsvdtUVxEiytoXM91BwDiH_K524sf5BSOfVM.cache b/tmp/cache/assets/development/sprockets/v3.0/XcTZIddMsvdtUVxEiytoXM91BwDiH_K524sf5BSOfVM.cache
new file mode 100644
index 0000000000000000000000000000000000000000..76c2544a8f8338e1f3601e201ba6b73507d2d033
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/XcTZIddMsvdtUVxEiytoXM91BwDiH_K524sf5BSOfVM.cache
@@ -0,0 +1 @@
+"%·!J‰Ú‚ÆHx1µÚâM˜•k»^º7k¸Š}¬yÊ¥
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/ZRmrtAm1CtK5YuAVkNvIjEeGRUlSVNTeI3vz6tVHqaQ.cache b/tmp/cache/assets/development/sprockets/v3.0/ZRmrtAm1CtK5YuAVkNvIjEeGRUlSVNTeI3vz6tVHqaQ.cache
new file mode 100644
index 0000000000000000000000000000000000000000..7711da308915bdf3f93667103b7444d616657227
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/ZRmrtAm1CtK5YuAVkNvIjEeGRUlSVNTeI3vz6tVHqaQ.cache
@@ -0,0 +1 @@
+"%{±¼•W.oÿÎrª<†ÞëŽ$†NyÄxF>Šgj¶D­É
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/aPFwSk3f5_Lzmkuo0aoEwZkKqLyMRPsAKWwK5-yYQP4.cache b/tmp/cache/assets/development/sprockets/v3.0/aPFwSk3f5_Lzmkuo0aoEwZkKqLyMRPsAKWwK5-yYQP4.cache
new file mode 100644
index 0000000000000000000000000000000000000000..c951b6451f338250194f283ca19c412ae7f77e34
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/aPFwSk3f5_Lzmkuo0aoEwZkKqLyMRPsAKWwK5-yYQP4.cache
@@ -0,0 +1,2 @@
+"%Ý=8
^1·µ"ò
++ÁêìÁ¨=ÓRsÇž¯ó²7<Æ
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/cjgK-QgIfqwaiFH_NZOKu8J8iSuIxBr25-mY8-7pO8w.cache b/tmp/cache/assets/development/sprockets/v3.0/cjgK-QgIfqwaiFH_NZOKu8J8iSuIxBr25-mY8-7pO8w.cache
new file mode 100644
index 0000000000000000000000000000000000000000..b954c24194b96bc4f10cb8305a69d87b67ce5bc2
Binary files /dev/null and b/tmp/cache/assets/development/sprockets/v3.0/cjgK-QgIfqwaiFH_NZOKu8J8iSuIxBr25-mY8-7pO8w.cache differ
diff --git a/tmp/cache/assets/development/sprockets/v3.0/dskM_aIDG1OD0ZNCmvT-DdcGGQNymkgjWq0VgxQp8DM.cache b/tmp/cache/assets/development/sprockets/v3.0/dskM_aIDG1OD0ZNCmvT-DdcGGQNymkgjWq0VgxQp8DM.cache
new file mode 100644
index 0000000000000000000000000000000000000000..ca08dc4c51b7de4bb3145e7a20a57c090ca9c181
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/dskM_aIDG1OD0ZNCmvT-DdcGGQNymkgjWq0VgxQp8DM.cache
@@ -0,0 +1 @@
+I"app/assets/javascripts/cars.coffee?type=application/javascript&pipeline=self&id=0bfc3425c1e36ea702b093bba5172e6607ec442eaf340f2af6c4aeb91939a0b4:ET
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/eQqnJIMeMskLVCzPs0qlNfbFOtPcn9ayt2wuFTQetKA.cache b/tmp/cache/assets/development/sprockets/v3.0/eQqnJIMeMskLVCzPs0qlNfbFOtPcn9ayt2wuFTQetKA.cache
new file mode 100644
index 0000000000000000000000000000000000000000..bb815993148164628c847c7c6beedd0197ea43aa
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/eQqnJIMeMskLVCzPs0qlNfbFOtPcn9ayt2wuFTQetKA.cache
@@ -0,0 +1 @@
+I"…app/assets/javascripts/application.js?type=application/javascript&id=1bacffaa9f9c2afd494d6ef1d1eef86605dbbd9ae6d85288afbb8f97fbe6d36d:ET
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/i-E-7DjUnnzoAS5ncrTAkXIRrnPoZff_vo7CKqg5IM8.cache b/tmp/cache/assets/development/sprockets/v3.0/i-E-7DjUnnzoAS5ncrTAkXIRrnPoZff_vo7CKqg5IM8.cache
new file mode 100644
index 0000000000000000000000000000000000000000..47e05f3362548ded1cc89b9c9312b0284b58c427
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/i-E-7DjUnnzoAS5ncrTAkXIRrnPoZff_vo7CKqg5IM8.cache
@@ -0,0 +1 @@
+"%ÃýûÒ`­ë
×/F° â„×	ŠÏÐY(}HÑRÏ
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/isMDf1JeEQGKE4jypP-TrjsfH7U6v7ZN-zc-J5pt57U.cache b/tmp/cache/assets/development/sprockets/v3.0/isMDf1JeEQGKE4jypP-TrjsfH7U6v7ZN-zc-J5pt57U.cache
new file mode 100644
index 0000000000000000000000000000000000000000..fb5afb873a4e558c09d0da24298169aa80693228
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/isMDf1JeEQGKE4jypP-TrjsfH7U6v7ZN-zc-J5pt57U.cache
@@ -0,0 +1 @@
+"%~Á½¦a>Žå¹P:c $/Â}eHKTN—Yí†[Þ
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/j7GEEGNGGOe8u7tBnGLKgt1apgG99_AoYAMgZcsBCkE.cache b/tmp/cache/assets/development/sprockets/v3.0/j7GEEGNGGOe8u7tBnGLKgt1apgG99_AoYAMgZcsBCkE.cache
new file mode 100644
index 0000000000000000000000000000000000000000..2800ad3b2e2cbf3921f3032ad1306f4749f08af2
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/j7GEEGNGGOe8u7tBnGLKgt1apgG99_AoYAMgZcsBCkE.cache
@@ -0,0 +1 @@
+"%ã°ÄB˜üšûôÈ™o¹$'®Aäd›“L¤•™xR¸U
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/jkpzefA0waxnPuGAFOkOGcQTaZuLOcWM5l5dZs4LLU8.cache b/tmp/cache/assets/development/sprockets/v3.0/jkpzefA0waxnPuGAFOkOGcQTaZuLOcWM5l5dZs4LLU8.cache
new file mode 100644
index 0000000000000000000000000000000000000000..e5cb87af84f3f43cbd929f533d7b845cfa1dfb84
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/jkpzefA0waxnPuGAFOkOGcQTaZuLOcWM5l5dZs4LLU8.cache
@@ -0,0 +1 @@
+"%ØKMƼ<+3“ò‹“°Ö……Üog«´ÂVM:¡]øC
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/kSkCWaAJCcTgZ_AhrRCjZhNtkE12cubiq70uNtditqk.cache b/tmp/cache/assets/development/sprockets/v3.0/kSkCWaAJCcTgZ_AhrRCjZhNtkE12cubiq70uNtditqk.cache
index 5b14438a70b7ab6ddd911876002454141f21cff3..349a97001a1715fc08c905eebfcbe4be7cae487d 100644
Binary files a/tmp/cache/assets/development/sprockets/v3.0/kSkCWaAJCcTgZ_AhrRCjZhNtkE12cubiq70uNtditqk.cache and b/tmp/cache/assets/development/sprockets/v3.0/kSkCWaAJCcTgZ_AhrRCjZhNtkE12cubiq70uNtditqk.cache differ
diff --git a/tmp/cache/assets/development/sprockets/v3.0/mUds1m94NgZ93PJh3ITqlGJUauexqJKl-LDjrmL59-E.cache b/tmp/cache/assets/development/sprockets/v3.0/mUds1m94NgZ93PJh3ITqlGJUauexqJKl-LDjrmL59-E.cache
new file mode 100644
index 0000000000000000000000000000000000000000..02db58c68c7a43ed9b90be636c3ef9b40f7815ab
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/mUds1m94NgZ93PJh3ITqlGJUauexqJKl-LDjrmL59-E.cache
@@ -0,0 +1 @@
+"%¯{ô*ƒ댖Þ}xjö¹-"Shÿ¬àêvz…L¤µ
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/vZ9j--tRCwvWkODhilg7NuWNH3pZyheTE8nYhktQOSs.cache b/tmp/cache/assets/development/sprockets/v3.0/vZ9j--tRCwvWkODhilg7NuWNH3pZyheTE8nYhktQOSs.cache
new file mode 100644
index 0000000000000000000000000000000000000000..2800ad3b2e2cbf3921f3032ad1306f4749f08af2
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/vZ9j--tRCwvWkODhilg7NuWNH3pZyheTE8nYhktQOSs.cache
@@ -0,0 +1 @@
+"%ã°ÄB˜üšûôÈ™o¹$'®Aäd›“L¤•™xR¸U
\ No newline at end of file
diff --git a/tmp/cache/assets/development/sprockets/v3.0/wV3RgZHG9HAPKnQDuTqIql5q4DKPG32vJtLSy75Qi4c.cache b/tmp/cache/assets/development/sprockets/v3.0/wV3RgZHG9HAPKnQDuTqIql5q4DKPG32vJtLSy75Qi4c.cache
new file mode 100644
index 0000000000000000000000000000000000000000..1ff5f1c098b1607550d370db7134067bbbf1d844
Binary files /dev/null and b/tmp/cache/assets/development/sprockets/v3.0/wV3RgZHG9HAPKnQDuTqIql5q4DKPG32vJtLSy75Qi4c.cache differ
diff --git a/tmp/cache/assets/development/sprockets/v3.0/zz8Z0pKuP5hxH-wJweNZy5vNZb7vdbIn91VyHtXIxMM.cache b/tmp/cache/assets/development/sprockets/v3.0/zz8Z0pKuP5hxH-wJweNZy5vNZb7vdbIn91VyHtXIxMM.cache
new file mode 100644
index 0000000000000000000000000000000000000000..d4d70cd0f01637a0c74674c1deafa9b24fd4063f
--- /dev/null
+++ b/tmp/cache/assets/development/sprockets/v3.0/zz8Z0pKuP5hxH-wJweNZy5vNZb7vdbIn91VyHtXIxMM.cache
@@ -0,0 +1 @@
+"%Ѱč@œñÎúÖ6HâuZoX…Zøgbh0W‘×V
\ No newline at end of file
diff --git a/tmp/pids/server.pid b/tmp/pids/server.pid
deleted file mode 100644
index 9974e834b84a20fb8044d73f08a364c34ced59f7..0000000000000000000000000000000000000000
--- a/tmp/pids/server.pid
+++ /dev/null
@@ -1 +0,0 @@
-3730
\ No newline at end of file