Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into crm

Gemfile

@@ -9,6 +9,10 @@ end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record
+<<<<<<< HEAD
+#gem 'mysql2', '>= 0.3.18', '< 0.5'
+gem 'pg'
+=======
 gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
@@ -17,6 +21,7 @@ gem 'pg'
 # redis server for cable
 # gem 'redis', '~> 3.0'
 
+>>>>>>> a2c9996b765666db4cbcbef188fcfa2d27a7a6e2
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets