diff --git a/Gemfile b/Gemfile
index a56dd3d..dc570bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,12 +7,12 @@ end
\
-gem 'bootstrap-sass', '~> 3.3.6'
+gem 'bootstrap-sass'
gem 'simple_form'
gem 'geocoder'
gem 'carrierwave', '~> 1.0'
-gem 'pg'
+#gem 'pg'
gem 'stripe'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8438875..45799ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,8 +113,6 @@ GEM
nokogiri (1.8.1-x64-mingw32)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
- pg (0.21.0)
- pg (0.21.0-x64-mingw32)
public_suffix (3.0.0)
puma (3.10.0)
rack (2.0.3)
@@ -209,7 +207,7 @@ PLATFORMS
x64-mingw32
DEPENDENCIES
- bootstrap-sass (~> 3.3.6)
+ bootstrap-sass
byebug
capybara (~> 2.13)
carrierwave (~> 1.0)
@@ -217,7 +215,6 @@ DEPENDENCIES
devise
geocoder
jbuilder (~> 2.5)
- pg
puma (~> 3.7)
rails (~> 5.1.4)
sass-rails (~> 5.0)
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss
similarity index 93%
rename from app/assets/stylesheets/application.css
rename to app/assets/stylesheets/application.scss
index d05ea0f..381bef3 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.scss
@@ -10,6 +10,9 @@
* files in this directory. Styles in this file should be added after the last require_* statement.
* It is generally better to create a new file per style scope.
*
+
*= require_tree .
*= require_self
*/
+@import "bootstrap-sprockets";
+@import "bootstrap";
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
new file mode 100644
index 0000000..250f356
--- /dev/null
+++ b/app/views/layouts/_navbar.html.erb
@@ -0,0 +1,32 @@
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index bae9724..751fd4c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,8 +9,15 @@
- <%= yield %>
+
+ <%= render 'layouts/navbar'%>
+ <%= yield %>
+
+
<%= notice %>
<%= alert %>
+
+
+